diff --git a/src/main/java/forge/card/CardRulesPredicates.java b/src/main/java/forge/card/CardRulesPredicates.java
index 35b5c0d6d62..87545fe01fe 100644
--- a/src/main/java/forge/card/CardRulesPredicates.java
+++ b/src/main/java/forge/card/CardRulesPredicates.java
@@ -290,15 +290,14 @@ public final class CardRulesPredicates {
             boolean shouldContain;
             switch (this.field) {
             case NAME:
-                return this.op(card.getName(), this.operand);
+                return op(card.getName(), this.operand);
             case SUBTYPE:
                 shouldContain = (this.getOperator() == StringOp.CONTAINS) || (this.getOperator() == StringOp.EQUALS);
                 return shouldContain == card.getType().subTypeContains(this.operand);
             case ORACLE_TEXT:
-                shouldContain = (this.getOperator() == StringOp.CONTAINS) || (this.getOperator() == StringOp.EQUALS);
-                return shouldContain == card.getOracleText().contains(this.operand);
+                return op(card.getOracleText(), operand);
             case JOINED_TYPE:
-                return this.op(card.getType().toString(), this.operand);
+                return op(card.getType().toString(), operand);
             default:
                 return false;
             }
diff --git a/src/main/java/forge/gui/deckeditor/SFilterUtil.java b/src/main/java/forge/gui/deckeditor/SFilterUtil.java
index 347802341b8..5e097ad6c52 100644
--- a/src/main/java/forge/gui/deckeditor/SFilterUtil.java
+++ b/src/main/java/forge/gui/deckeditor/SFilterUtil.java
@@ -88,20 +88,15 @@ public class SFilterUtil {
             return Predicates.alwaysTrue();
         }
         
-        String[] splitText = text
-                    .replaceAll(",", "")
-                    .replaceAll("  ", " ")
-                    .toLowerCase().split(" ");
+        String[] splitText = text.replaceAll(",", "").replaceAll("  ", " ").split(" ");
 
         List<Predicate<CardRules>> terms = new ArrayList<Predicate<CardRules>>();
         for (String s : splitText) {
             List<Predicate<CardRules>> subands = new ArrayList<Predicate<CardRules>>();
 
-            if (inName) { subands.add(CardRulesPredicates.name(StringOp.CONTAINS_IC, s)); }
+            if (inName) { subands.add(CardRulesPredicates.name(StringOp.CONTAINS_IC, s));       }
             if (inType) { subands.add(CardRulesPredicates.joinedType(StringOp.CONTAINS_IC, s)); }
-            
-            // rules cannot compare in ignore-case way
-            if (inText) { subands.add(CardRulesPredicates.rules(StringOp.CONTAINS, s)); }
+            if (inText) { subands.add(CardRulesPredicates.rules(StringOp.CONTAINS_IC, s));      }
 
             terms.add(Predicates.or(subands));
         }