diff --git a/source/java/org/alfresco/repo/web/scripts/RepoStore.java b/source/java/org/alfresco/repo/web/scripts/RepoStore.java
index 8cac105ffa..395e59bf6e 100644
--- a/source/java/org/alfresco/repo/web/scripts/RepoStore.java
+++ b/source/java/org/alfresco/repo/web/scripts/RepoStore.java
@@ -34,7 +34,6 @@ import java.util.regex.Pattern;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.model.filefolder.FileFolderServiceImpl;
-import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.tenant.TenantAdminService;
 import org.alfresco.repo.tenant.TenantDeployer;
@@ -50,7 +49,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.QueryParameterDefinition;
-import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.NamespaceService;
@@ -546,12 +544,12 @@ public class RepoStore extends AbstractStore implements TenantDeployer
                 }
                 else
                 {
-                    result.append(AbstractLuceneQueryParser.escape(token));
+                    result.append(SearchLanguageConversion.escapeLuceneQuery(token));
                 }
             }
             else
             {
-                result.append(AbstractLuceneQueryParser.escape(token));
+                result.append(SearchLanguageConversion.escapeLuceneQuery(token));
             }
         }
         return result.toString();
diff --git a/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java b/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
index 3b555c6170..7737f0de5d 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
@@ -35,6 +35,7 @@ import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.util.GUID;
+import org.alfresco.util.SearchLanguageConversion;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.queryParser.QueryParser;
@@ -158,7 +159,7 @@ public class KeywordSearch extends DeclarativeWebScript
             // Escape special characters in the terms, so that they can't confuse the parser 
             for (int i=0; i<terms.length; i++) 
             { 
-                terms[i] = QueryParser.escape(terms[i]); 
+                terms[i] = SearchLanguageConversion.escapeLuceneQuery(terms[i]); 
             } 
 
             Map<String, Object> statementModel = new HashMap<String, Object>(7, 1.0f);