diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpLookup.java b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpLookup.java
index fc727026e..9a45c71c3 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpLookup.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpLookup.java
@@ -30,7 +30,7 @@ public class DmpLookup extends Lookup {
 
     private List<Integer> versions;
 
-    private DmpDescriptionTemplateQuery dmpDescriptionTemplateSubQuery;
+    private DmpDescriptionTemplateLookup dmpDescriptionTemplateSubQuery;
 
     public String getLike() {
         return like;
@@ -96,11 +96,11 @@ public class DmpLookup extends Lookup {
         this.versionStatuses = versionStatuses;
     }
 
-    public DmpDescriptionTemplateQuery getDmpDescriptionTemplateSubQuery() {
+    public DmpDescriptionTemplateLookup getDmpDescriptionTemplateSubQuery() {
         return dmpDescriptionTemplateSubQuery;
     }
 
-    public void setDmpDescriptionTemplateSubQuery(DmpDescriptionTemplateQuery dmpDescriptionTemplateSubQuery) {
+    public void setDmpDescriptionTemplateSubQuery(DmpDescriptionTemplateLookup dmpDescriptionTemplateSubQuery) {
         this.dmpDescriptionTemplateSubQuery = dmpDescriptionTemplateSubQuery;
     }
 
@@ -114,7 +114,7 @@ public class DmpLookup extends Lookup {
         if (this.statuses != null) query.statuses(this.statuses);
         if (this.versions != null) query.versions(this.versions);
         if (this.versionStatuses != null) query.versionStatuses(this.versionStatuses);
-        if (this.dmpDescriptionTemplateSubQuery != null) query.dmpDescriptionTemplateSubQuery(this.dmpDescriptionTemplateSubQuery);
+        if (this.dmpDescriptionTemplateSubQuery != null) query.dmpDescriptionTemplateSubQuery(this.dmpDescriptionTemplateSubQuery.enrich(queryFactory));
 
         this.enrichCommon(query);