diff --git a/source/java/org/alfresco/cmis/search/CMISQueryParser.java b/source/java/org/alfresco/cmis/search/CMISQueryParser.java
index 2f2c49a5c3..1d383f8b7e 100644
--- a/source/java/org/alfresco/cmis/search/CMISQueryParser.java
+++ b/source/java/org/alfresco/cmis/search/CMISQueryParser.java
@@ -763,7 +763,7 @@ public class CMISQueryParser
                                 }
                             }
 
-                            CMISTypeDefinition typeDef = cmisDictionaryService.findTypeForClass(selector.getType(), CMISScope.DOCUMENT, CMISScope.FOLDER);
+                            CMISTypeDefinition typeDef = cmisDictionaryService.findTypeForClass(selector.getType(), CMISScope.DOCUMENT, CMISScope.FOLDER, CMISScope.POLICY);
                             if (typeDef == null)
                             {
                                 throw new CMISQueryException("Type unsupported in CMIS queries: " + selector.getAlias());
@@ -832,7 +832,7 @@ public class CMISQueryParser
                             }
                         }
 
-                        CMISTypeDefinition typeDef = cmisDictionaryService.findTypeForClass(selector.getType(), CMISScope.DOCUMENT, CMISScope.FOLDER);
+                        CMISTypeDefinition typeDef = cmisDictionaryService.findTypeForClass(selector.getType(), CMISScope.DOCUMENT, CMISScope.FOLDER, CMISScope.POLICY);
                         if (typeDef == null)
                         {
                             throw new CMISQueryException("Type unsupported in CMIS queries: " + selector.getAlias());