diff --git a/internal/storage/search.go b/internal/storage/search.go
index 205d2d0..5b988c5 100644
--- a/internal/storage/search.go
+++ b/internal/storage/search.go
@@ -229,6 +229,7 @@ func searchQueryBuilder(searchString string) *sqlf.Stmt {
 		if len(w) > 1 && (strings.HasPrefix(w, "-") || strings.HasPrefix(w, "!")) {
 			exclude = true
 			w = w[1:]
+			lw = lw[1:]
 		}
 
 		re := regexp.MustCompile(`[a-zA-Z0-9]+`)
diff --git a/server/server_test.go b/server/server_test.go
index 58faebf..f3250f5 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -194,14 +194,16 @@ func TestAPIv1Search(t *testing.T) {
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "from-1@example.com", 1)
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "from:from-1@example.com", 1)
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "-from:from-1@example.com", 99)
+	assertSearchEqual(t, ts.URL+"/api/v1/search", "-FROM:FROM-1@EXAMPLE.COM", 99)
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "to:from-1@example.com", 0)
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "from:@example.com", 100)
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "subject:\"Subject line\"", 100)
-	assertSearchEqual(t, ts.URL+"/api/v1/search", "subject:\"Subject line 17 end\"", 1)
+	assertSearchEqual(t, ts.URL+"/api/v1/search", "subject:\"SUBJECT LINE 17 END\"", 1)
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "!thisdoesnotexist", 100)
-	assertSearchEqual(t, ts.URL+"/api/v1/search", "-thisdoesnotexist", 100)
+	assertSearchEqual(t, ts.URL+"/api/v1/search", "-ThisDoesNotExist", 100)
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "thisdoesnotexist", 0)
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "tag:\"Test tag 065\"", 1)
+	assertSearchEqual(t, ts.URL+"/api/v1/search", "tag:\"TEST TAG 065\"", 1)
 	assertSearchEqual(t, ts.URL+"/api/v1/search", "!tag:\"Test tag 023\"", 99)
 }