diff --git a/cockatrice/src/filter_string.cpp b/cockatrice/src/filter_string.cpp
index ea8457c5..442f0e9f 100644
--- a/cockatrice/src/filter_string.cpp
+++ b/cockatrice/src/filter_string.cpp
@@ -42,11 +42,11 @@ ColorQuery <- [cC] 'olor'? <[iI]?> <[:!]> ColorEx*
 FieldQuery <- String [:] RegexString / String ws? NumericExpression
 
 NonQuote <- !["].
-UnescapedStringListPart <- [a-zA-Z0-9/\']+
-String <- UnescapedStringListPart / ["] <NonQuote*> ["]
+UnescapedStringListPart <- ![":<>=! ].
+String <- UnescapedStringListPart+ / ["] <NonQuote*> ["]
 StringValue <- String / [(] StringList [)]
 StringList <- StringListString (ws? [,] ws? StringListString)*
-StringListString <- UnescapedStringListPart
+StringListString <- UnescapedStringListPart+
 GenericQuery <- RegexString
 RegexString <- String