diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
index dcc158405..dad039e94 100644
--- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
+++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java
@@ -146,7 +146,7 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
 
             }
 
-            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery("datasets", boolQuery, ScoreMode.Avg).innerHit(new InnerHitBuilder().setFetchSourceContext(new FetchSourceContext(true, new String[]{"datasets.tags"}, null)));
+            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery("datasets", boolQuery, ScoreMode.Avg).innerHit(new InnerHitBuilder().setFetchSourceContext(new FetchSourceContext(true, new String[]{"datasets.tags"}, null)).setSize(this.environment.getProperty("elasticsearch.innerHitsSize", Integer.class)));
             searchSourceBuilder.query(nestedQueryBuilder)/*.from(criteria.getOffset())*/.fetchSource("datasets.tags", null);
             /*if (criteria.getSize() > 0) {
                 searchSourceBuilder.size(criteria.getSize());
@@ -206,7 +206,7 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
 
             }
 
-            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery("datasets", boolQuery, ScoreMode.None).innerHit(new InnerHitBuilder().setFetchSourceContext(new FetchSourceContext(true, new String[]{"datasets.id"}, null)));
+            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery("datasets", boolQuery, ScoreMode.None).innerHit(new InnerHitBuilder().setFetchSourceContext(new FetchSourceContext(true, new String[]{"datasets.id"}, null)).setSize(this.environment.getProperty("elasticsearch.innerHitsSize", Integer.class)));
             searchSourceBuilder.query(nestedQueryBuilder)/*.from(criteria.getOffset()).size(criteria.getSize())*/.fetchSource("datasets.id", null);
             sortBuilders.forEach(searchSourceBuilder::sort);
             searchRequest.source(searchSourceBuilder);
diff --git a/dmp-backend/web/src/main/resources/config/application-devel.properties b/dmp-backend/web/src/main/resources/config/application-devel.properties
index 372b55e17..b07504ede 100644
--- a/dmp-backend/web/src/main/resources/config/application-devel.properties
+++ b/dmp-backend/web/src/main/resources/config/application-devel.properties
@@ -14,6 +14,7 @@ elasticsearch.port = 9200
 elasticsearch.username=elastic
 elasticsearch.password=
 elasticsearch.index=dmps
+elasticsearch.innerHitsSize=100
 
 ####################ELK OVERRIDES CONFIGURATIONS##########
 http-logger.server-address = http://localhost:31311
diff --git a/dmp-backend/web/src/main/resources/config/application-docker.properties b/dmp-backend/web/src/main/resources/config/application-docker.properties
index 2c200ae68..5f5d310b0 100644
--- a/dmp-backend/web/src/main/resources/config/application-docker.properties
+++ b/dmp-backend/web/src/main/resources/config/application-docker.properties
@@ -14,6 +14,7 @@ elasticsearch.index=dmps
 elasticsearch.usingssl=false
 elasticsearch.certPath=
 elasticsearch.certKey=
+elasticsearch.innerHitsSize=100
 
 ####################ELK OVERRIDES CONFIGURATIONS##########
 #http-logger.server-address = http://logstash:31311
diff --git a/dmp-backend/web/src/main/resources/config/application-production.properties b/dmp-backend/web/src/main/resources/config/application-production.properties
index 87b5847bc..46a32086b 100644
--- a/dmp-backend/web/src/main/resources/config/application-production.properties
+++ b/dmp-backend/web/src/main/resources/config/application-production.properties
@@ -11,6 +11,7 @@ elasticsearch.port = 9200
 elasticsearch.username=elastic
 elasticsearch.password=
 elasticsearch.index=dmps
+elasticsearch.innerHitsSize=100
 
 ####################PDF OVERRIDES CONFIGURATIONS##########
 pdf.converter.url=http://docsbox-web/
diff --git a/dmp-backend/web/src/main/resources/config/application.properties b/dmp-backend/web/src/main/resources/config/application.properties
index 0facad0ba..8b4de3430 100644
--- a/dmp-backend/web/src/main/resources/config/application.properties
+++ b/dmp-backend/web/src/main/resources/config/application.properties
@@ -46,6 +46,7 @@ elasticsearch.index=
 elasticsearch.usingssl=false
 elasticsearch.certPath=
 elasticsearch.certKey=
+elasticsearch.innerHitsSize=100
 
 ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS##########
 configuration.externalUrls=externalUrls/ExternalUrls.xml