diff --git a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
index 166534b33b..3de0faa69d 100644
--- a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
+++ b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
@@ -817,7 +817,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
         {
             CMISNodeInfo folderInfo = getOrCreateFolderInfo(folderId, "Folder");
 
-            params.setQuery("+=cm:workingCopyOwner:\""+AuthenticationUtil.getFullyAuthenticatedUser()+"\" +=PARENT:\""+folderInfo.getNodeRef().toString()+"\"");
+            params.setQuery("+=cm:workingCopyOwner:\""+AuthenticationUtil.getFullyAuthenticatedUser()+"\" AND +=PARENT:\""+folderInfo.getNodeRef().toString()+"\"");
             params.addStore(folderInfo.getNodeRef().getStoreRef());
         }
 
diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
index 2f9c82f26f..70a848e7a0 100644
--- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
+++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java
@@ -536,28 +536,32 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent
         
         
         String fieldName = qnameString;
-        // Check for any prefixes and expand to the full uri
-        if (qnameString.charAt(0) != '{')
+        if(fieldName.startsWith("@"))
         {
-            int colonPosition = qnameString.indexOf(':');
+            fieldName = fieldName.substring(1);
+        }
+        // Check for any prefixes and expand to the full uri
+        if (fieldName.charAt(0) != '{')
+        {
+            int colonPosition = fieldName.indexOf(':');
             if (colonPosition == -1)
             {
                 
                 
                 // use the default namespace
-                fieldName = "{" + NamespaceService.CONTENT_MODEL_1_0_URI + "}" + qnameString;
+                fieldName = "{" + NamespaceService.CONTENT_MODEL_1_0_URI + "}" + fieldName;
             }
             else
             {
-                String prefix = qnameString.substring(0, colonPosition);
+                String prefix = fieldName.substring(0, colonPosition);
                 String uri = matchURI(prefix, namespacePrefixResolver);
                 if (uri == null)
                 {
-                    fieldName = "{" + NamespaceService.CONTENT_MODEL_1_0_URI + "}" + qnameString;
+                    fieldName = "{" + NamespaceService.CONTENT_MODEL_1_0_URI + "}" + fieldName;
                 }
                 else
                 {
-                    fieldName = "{" + uri + "}" + qnameString.substring(colonPosition + 1);
+                    fieldName = "{" + uri + "}" + fieldName.substring(colonPosition + 1);
                 }
 
             }