diff --git a/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java b/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java
index <HASH>..<HASH> 100644
--- a/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java
+++ b/PluginBase/src/org/bimserver/database/queries/om/JsonQueryObjectModelConverter.java
@@ -406,7 +406,7 @@ public class JsonQueryObjectModelConverter {
 						addType(objectNode, queryPart, type, false);

 					} else if (typeNode.isObject()) {
 						ObjectNode typeDef = (ObjectNode) typeNode;
-						addType(objectNode, queryPart, typeDef.get("name").asText(), typeDef.get("includeAllSubTypes").asBoolean());
+						addType(objectNode, queryPart, typeDef.get("name").asText(), typeDef.has("includeAllSubTypes") && typeDef.get("includeAllSubTypes").asBoolean());
 					} else {

 						throw new QueryException("\"types\"[" + i + "] must be of type string");

 					}
Don't require includeAllSubTypes field