diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java
index 60b0acc278..a9f8a4744e 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java
@@ -127,16 +127,12 @@ public class KeywordSearchUtil {
             return false;
         }
     }
-    
+
     //TODO escaping should be handled by blackboard
     public static String escapeForBlackBoard(String text) {
         try {
-            text = text.replaceAll("\\\\", URLEncoder.encode("\\", "UTF-8"));
-            text = text.replaceAll("'", URLEncoder.encode("'", "UTF-8"));
-            text = text.replaceAll("=", URLEncoder.encode("=", "UTF-8"));
-            text = text.replaceAll("\\?", URLEncoder.encode("?", "UTF-8"));
-            text = text.replaceAll(">", URLEncoder.encode(">", "UTF-8"));
-            text = text.replaceAll("<", URLEncoder.encode("<", "UTF-8"));
+            text = text.replaceAll("\\\\'", URLEncoder.encode("\\'", "UTF-8"));
+            //text = text.replaceAll("\\\\", URLEncoder.encode("\\", "UTF-8"));
         } catch (UnsupportedEncodingException ex) {
         }
         return text;