diff --git a/src/main/java/org/caosdb/server/query/Query.java b/src/main/java/org/caosdb/server/query/Query.java
index e7bed06ec44597715bd94e388b858a8f30d5feee..695a295da5f64ec788c4dfbb3332734ead44b289 100644
--- a/src/main/java/org/caosdb/server/query/Query.java
+++ b/src/main/java/org/caosdb/server/query/Query.java
@@ -272,7 +272,7 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
         applyQueryTemplates(this, getSourceSet());
       }
 
-      if (this.role != null) {
+      if (this.role != null && this.role != Role.ENTITY) {
         final RoleFilter roleFilter = new RoleFilter(this.role, "=", this.versioned);
         roleFilter.apply(this);
       }
@@ -324,7 +324,8 @@ public class Query implements QueryInterface, ToElementable, TransactionInterfac
         final Query subQuery = new Query(q.getValue(), query.getUser());
         subQuery.setAccess(query.getAccess());
         subQuery.parse();
-        // TODO versioning is set to false here (hard) it this the best way to do it?
+
+        // versioning for QueryTemplates is not supported and probably never will.
         final String subResultSet = subQuery.executeStrategy(false);
 
         // ... and merge the resultSets.