diff --git a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearchParser.java b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearchParser.java
index 7543e4df80d..7d3d8123d83 100644
--- a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearchParser.java
+++ b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearchParser.java
@@ -43,7 +43,7 @@ public abstract class AdvancedSearchParser {
         }
 
         String key = token.substring(0, index).trim().toLowerCase();
-        String valueStr = token.substring(index + opUsed.length()).trim().toLowerCase();
+        String valueStr = token.substring(index + opUsed.length()).toLowerCase();
         boolean creatureOnly = false;
 
         Predicate<CardRules> predicate = null;
diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
index 2d949c80f98..7e08f2d9444 100644
--- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
+++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
@@ -81,6 +81,7 @@ public class SFilterUtil {
 
             if (ch == '"') {
                 inQuotes = !inQuotes;
+                current.append(ch);
                 continue;
             }