diff --git a/searchablecert.go b/searchablecert.go
index 77ab0e4922bc9bb1cf3a7cd1a22427e84a76505c..4f223b64e93432cc2aa241863997eb61c3121b9e 100644
--- a/searchablecert.go
+++ b/searchablecert.go
@@ -508,7 +508,7 @@ func CertToSearchable(c *x509.Certificate) SearchableCert {
 			token[strings.ToLower(localpart)] = true
 			for _, namepart := range strings.Split(localpart, ".") {
 				_, unwanted := nameFiller[namepart]
-				if unwanted == false {
+				if !unwanted {
 					token[strings.ToLower(namepart)] = true
 				}
 			}
@@ -531,9 +531,11 @@ func CertToSearchable(c *x509.Certificate) SearchableCert {
 		cert.Type = Extern
 	case CertificateStats.FilterIsNutzer(c):
 		cert.Type = Benutzer
-	case CertificateStats.And(CertificateStats.Or(SectigoPersonalFilter, IsUserHarica), NoCommonNameFilter)(c):
+	case IsUserHarica(c):
+		cert.Type = Benutzer
+	case CertificateStats.And(SectigoPersonalFilter, NoCommonNameFilter)(c):
 		cert.Type = Gruppe
-	case CertificateStats.And(CertificateStats.Or(SectigoPersonalFilter, IsUserHarica), CertificateStats.Not(NoCommonNameFilter))(c):
+	case CertificateStats.And(SectigoPersonalFilter, CertificateStats.Not(NoCommonNameFilter))(c):
 		cert.Type = Benutzer
 	default:
 		cert.Type = Server