diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
index 147f04c9852b8a5a074a733cf0d7143c50b9523f..285470ad821546d330f59cf7cd90729abb706ca4 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -31,12 +31,14 @@ import info.textgrid.middleware.oaipmh.RequestType;
 import info.textgrid.middleware.oaipmh.SetType;
 import info.textgrid.middleware.common.TextGridMimetypes;
 
-
 /**
  *
  */
 public class SetDeliverer {
 
+  private static final int DH_SIZE = 100000;
+  private static final int TG_SIZE = 1000;
+
   // private static Map<String, String> setSet = new Hashtable<String, String>();
 
   private Set<String> identifier = new LinkedHashSet<String>();
@@ -108,7 +110,7 @@ public class SetDeliverer {
 
       AggregationBuilder projectNameAndID = AggregationBuilders.terms("projects")
           .script(mergeProjectIDandProjectName)
-          .size(1000);
+          .size(TG_SIZE);
 
       filterPublicProjects.subAggregation(projectNameAndID);
       // >>>>>>> feature/elastic6
@@ -123,7 +125,10 @@ public class SetDeliverer {
       AggregationBuilder filterCollections = AggregationBuilders.filter("collectionFilter",
           QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery(
               "descriptiveMetada.dc:format", TextGridMimetypes.DARIAH_COLLECTION)));
-      AggregationBuilder filterTerm = AggregationBuilders.terms("collectionTerm").size(1000);
+
+      AggregationBuilder filterTerm = AggregationBuilders.terms("collectionTerm").size(DH_SIZE);
+
+      filterCollections.subAggregation(filterTerm);
 
       searchSourceBuilder.aggregation(filterCollections);
     }