diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java
index 27586fc819..78eea8bd68 100644
--- a/source/java/org/alfresco/repo/jscript/People.java
+++ b/source/java/org/alfresco/repo/jscript/People.java
@@ -292,7 +292,7 @@ public final class People extends BaseScopableProcessorExtension
                 StringBuilder query = new StringBuilder(128);
                 for (StringTokenizer t = new StringTokenizer(filter, " "); t.hasMoreTokens(); /**/)
                 {
-                    String term = QueryParser.escape(t.nextToken());
+                    String term = QueryParser.escape(t.nextToken().replace('"', ' '));
                     query.append("@").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:firstName:\"*");
                     query.append(term);
                     query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:lastName:\"*");
diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index fd6e1321ff..11fdb240ff 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.activities.ActivityType;
 import org.alfresco.repo.search.QueryParameterDefImpl;
+import org.alfresco.repo.search.impl.lucene.QueryParser;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
@@ -578,12 +579,12 @@ public class SiteServiceImpl implements SiteService, SiteModel
                     dictionaryService.getDataType(
                             DataTypeDefinition.TEXT),
                             true,
-                            nameFilter);
+                            QueryParser.escape(nameFilter.replace('"', ' ')));
             
             // get the sites that match the specified names
             StringBuilder query = new StringBuilder(128);
             query.append("+PARENT:\"").append(siteRoot.toString())
-                 .append("\" +@cm\\:name:\"*").append(nameFilter).append("*\"");
+                 .append("\" +@cm\\:name:\"*${cm:name}*\"");
             ResultSet results = this.searchService.query(
                     siteRoot.getStoreRef(),
                     SearchService.LANGUAGE_LUCENE,