diff --git a/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java b/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java
index 194f4bacc8..45915e6537 100644
--- a/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java
+++ b/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java
@@ -31,7 +31,7 @@ import javax.faces.model.SelectItem;
 import javax.transaction.UserTransaction;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
@@ -204,7 +204,7 @@ public class AddUsersDialog extends BaseDialogBean
                SelectItem[] items = new SelectItem[0];
                
                // Use lucene search to retrieve user details
-               String term = LuceneQueryParser.escape(contains.trim());
+               String term = AbstractLuceneQueryParser.escape(contains.trim());
                if (term.length() != 0)
                {
                    StringBuilder query = new StringBuilder(128);
diff --git a/source/java/org/alfresco/web/bean/search/SearchContext.java b/source/java/org/alfresco/web/bean/search/SearchContext.java
index f144d59a3e..c1874ed610 100644
--- a/source/java/org/alfresco/web/bean/search/SearchContext.java
+++ b/source/java/org/alfresco/web/bean/search/SearchContext.java
@@ -33,7 +33,7 @@ import javax.faces.context.FacesContext;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.Path;
@@ -346,8 +346,8 @@ public class SearchContext implements Serializable
          {
             String escapedName = Repository.escapeQName(qname);
             RangeProperties rp = rangeAttributes.get(qname);
-            String value1 = LuceneQueryParser.escape(rp.lower);
-            String value2 = LuceneQueryParser.escape(rp.upper);
+            String value1 = AbstractLuceneQueryParser.escape(rp.lower);
+            String value2 = AbstractLuceneQueryParser.escape(rp.upper);
             attributeQuery.append(" +@").append(escapedName)
                           .append(":").append(rp.inclusive ? "[" : "{").append(value1)
                           .append(" TO ").append(value2).append(rp.inclusive ? "]" : "}");
diff --git a/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java b/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
index daf0db4bbb..4a44bd8e26 100644
--- a/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
+++ b/source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
@@ -33,7 +33,7 @@ import javax.transaction.UserTransaction;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.node.archive.RestoreNodeReport;
 import org.alfresco.repo.node.archive.RestoreNodeReport.RestoreStatus;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.web.scripts.FileTypeImageUtils;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentData;
@@ -613,7 +613,7 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener
       else
       {
          // search by name in the archive store
-         String safeText = LuceneQueryParser.escape(property.getSearchText());
+         String safeText = AbstractLuceneQueryParser.escape(property.getSearchText());
          if (safeText.indexOf(' ') == -1)
          {
             if (property.isFullTextSearch())
@@ -675,8 +675,8 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener
          if (fromDate != null)
          {
             SimpleDateFormat df = CachingDateFormat.getDateFormat();
-            String strFromDate = LuceneQueryParser.escape(df.format(fromDate));
-            String strToDate = LuceneQueryParser.escape(df.format(toDate));
+            String strFromDate = AbstractLuceneQueryParser.escape(df.format(fromDate));
+            String strToDate = AbstractLuceneQueryParser.escape(df.format(toDate));
             StringBuilder buf = new StringBuilder(128);
             buf.append("@").append(DATE_ATTR)
                .append(":").append("[").append(strFromDate)
diff --git a/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java b/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java
index 4fde3a2ff0..1dc00ac619 100644
--- a/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java
@@ -39,7 +39,7 @@ import javax.transaction.UserTransaction;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.search.ResultSet;
@@ -256,7 +256,7 @@ public class SetPermissionsDialog extends UpdatePermissionsDialog
             if (filterIndex == 0)
             {
                 // Use lucene search to retrieve user details
-                String term = LuceneQueryParser.escape(contains.trim());
+                String term = AbstractLuceneQueryParser.escape(contains.trim());
                 StringBuilder query = new StringBuilder(128);
                 Utils.generatePersonSearch(query, term);
                 ResultSet resultSet = Repository.getServiceRegistry(context).getSearchService().query(Repository.getStoreRef(), SearchService.LANGUAGE_LUCENE, query.toString());
diff --git a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
index 6d0fa465c1..bbe49d8de1 100644
--- a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
@@ -38,7 +38,7 @@ import javax.faces.model.SelectItem;
 import javax.transaction.UserTransaction;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -441,7 +441,7 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean
          if (filterIndex == 0)
          {
             // Use lucene search to retrieve user details
-            String term = LuceneQueryParser.escape(search);
+            String term = AbstractLuceneQueryParser.escape(search);
             StringBuilder query = new StringBuilder(128);
             if (contains == null || contains.length() == 0)
             {
diff --git a/source/java/org/alfresco/web/bean/workflow/BaseReassignDialog.java b/source/java/org/alfresco/web/bean/workflow/BaseReassignDialog.java
index b18680d62d..2b13b6a3e6 100644
--- a/source/java/org/alfresco/web/bean/workflow/BaseReassignDialog.java
+++ b/source/java/org/alfresco/web/bean/workflow/BaseReassignDialog.java
@@ -29,7 +29,7 @@ import javax.faces.model.SelectItem;
 import javax.transaction.UserTransaction;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.search.LimitBy;
@@ -143,7 +143,7 @@ public abstract class BaseReassignDialog extends BaseDialogBean
          int maxResults = Application.getClientConfig(context).getInviteUsersMaxResults();
          
          // Use lucene search to retrieve user details
-         String term = LuceneQueryParser.escape(contains.trim());
+         String term = AbstractLuceneQueryParser.escape(contains.trim());
          StringBuilder query = new StringBuilder(128);
          Utils.generatePersonSearch(query, term);
          
diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
index 34e7b18258..a550c17f8d 100644
--- a/source/java/org/alfresco/web/ui/common/Utils.java
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -49,7 +49,7 @@ import org.alfresco.jlan.server.filesys.DiskSharedDevice;
 import org.alfresco.jlan.server.filesys.FilesystemsConfigSection;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.repo.webdav.WebDAVHelper;
 import org.alfresco.repo.webdav.WebDAVServlet;
@@ -1058,7 +1058,7 @@ public final class Utils extends StringUtils
       // define the query to find people by their first or last name
       for (StringTokenizer t = new StringTokenizer(term.trim(), " "); t.hasMoreTokens(); /**/)
       {
-         String token = LuceneQueryParser.escape(t.nextToken());
+         String token = AbstractLuceneQueryParser.escape(t.nextToken());
          query.append("+TYPE:\"").append(ContentModel.TYPE_PERSON).append("\" ");
          query.append("+(@").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:firstName:\"*");
          query.append(token);
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIContentSelector.java b/source/java/org/alfresco/web/ui/repo/component/UIContentSelector.java
index 6f59071137..34ec2c61ef 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIContentSelector.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIContentSelector.java
@@ -29,7 +29,7 @@ import javax.faces.context.ResponseWriter;
 import javax.faces.el.ValueBinding;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.search.LimitBy;
@@ -348,7 +348,7 @@ public class UIContentSelector extends UIInput
       
       if (contains != null && contains.length() > 0)
       {
-    	 String safeContains = LuceneQueryParser.escape(contains.trim());
+    	 String safeContains = AbstractLuceneQueryParser.escape(contains.trim());
          query.append(" AND +@");
          
          String nameAttr = Repository.escapeQName(QName.createQName(