diff --git a/entity-solr/src/main/java/eu/europeana/entity/solr/service/impl/EntityQueryBuilder.java b/entity-solr/src/main/java/eu/europeana/entity/solr/service/impl/EntityQueryBuilder.java
index 2cf96bd..cd1fef8 100644
--- a/entity-solr/src/main/java/eu/europeana/entity/solr/service/impl/EntityQueryBuilder.java
+++ b/entity-solr/src/main/java/eu/europeana/entity/solr/service/impl/EntityQueryBuilder.java
@@ -30,6 +30,7 @@ public class EntityQueryBuilder extends QueryBuilder {
     public static final String DESC = "desc";
     public static final String OR = " " + SimpleParams.OR_OPERATOR + " ";
     public static final String AND = " " + SimpleParams.AND_OPERATOR + " ";
+    private static final int DEFAULT_START_PAGE = 1;
 
     public SolrQuery toSolrQuery(Query searchQuery, String searchHandler, List<EntityTypes> entityTypes, String scope) {
 	SolrQuery solrQuery = super.toSolrQuery(searchQuery, searchHandler);
@@ -38,10 +39,10 @@ public SolrQuery toSolrQuery(Query searchQuery, String searchHandler, List<Entit
 	solrQuery.set(PARAM_QUERY_OPERATOR, SimpleParams.AND_OPERATOR);
 	return solrQuery;
     }
-    
+        
     @Override
-    protected int computeSolrQueryStart(Query searchQuery) {
-      return (searchQuery.getPageNr() - 1) * searchQuery.getPageSize();
+    public int getDefaultStarPage() {
+      return DEFAULT_START_PAGE;
     }
 
     private boolean hasScopeEuropeana(String scope) {
@@ -226,7 +227,7 @@ public Query buildParameterSearchQuery(MultiValueMap<String, String> parameters,
 
 	// process pageSize
 	if (StringUtils.isEmpty(page))
-	    page = "" + Query.DEFAULT_PAGE;
+	    page = "" + getDefaultStarPage();
 
 	// process pageSize
 	if (StringUtils.isEmpty(pageSize))
@@ -290,7 +291,7 @@ public Query buildSearchQueryForEnrichment(String text, String lang, List<Entity
 		searchQuery.setFilters(createFilterForEnrichment(entityTypes));
 		searchQuery.setSortCriteria(toArray(ConceptSolrFields.DERIVED_SCORE + " " +DESC));
 		searchQuery.setPageSize(Math.min(pageSize, WebEntityConstants.ENRICH_MAX_PAGE_SIZE));
-		searchQuery.setPageNr(1);
+		searchQuery.setPageNr(getDefaultStarPage());
 		
 		return searchQuery;
 	}
diff --git a/entity-stats/src/main/java/eu/europeana/entity/stats/service/UsageStatsService.java b/entity-stats/src/main/java/eu/europeana/entity/stats/service/UsageStatsService.java
index 03874b4..7a29072 100644
--- a/entity-stats/src/main/java/eu/europeana/entity/stats/service/UsageStatsService.java
+++ b/entity-stats/src/main/java/eu/europeana/entity/stats/service/UsageStatsService.java
@@ -1,19 +1,14 @@
 package eu.europeana.entity.stats.service;
 
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-
 import javax.annotation.Resource;
-
 import org.apache.commons.math3.util.Precision;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Service;
-
 import eu.europeana.api.commons.definitions.search.FacetFieldView;
 import eu.europeana.api.commons.definitions.search.Query;
 import eu.europeana.api.commons.definitions.statistics.entity.EntitiesPerLanguage;
@@ -94,7 +89,7 @@ private EntitiesPerLanguage getEntityPerLangValues(String lang, EntityStats enti
 
     private static Query buildSearchQuery(String queryString, String facet) {
         EntityQueryBuilder queryBuilder = new EntityQueryBuilder();
-        return queryBuilder.buildSearchQuery(queryString, null, queryBuilder.toArray(facet), null, 0, 0,
+        return queryBuilder.buildSearchQuery(queryString, null, queryBuilder.toArray(facet), null, queryBuilder.getDefaultStarPage(), 0,
                 SearchProfiles.facets, null);
     }
 
diff --git a/pom.xml b/pom.xml
index d8f1e49..9ac77cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
 		
 		<sonar.organization>europeana</sonar.organization>
 		<version.junit>5.7.0</version.junit>
-		<version.commonsApi>0.4.1</version.commonsApi>
+		<version.commonsApi>0.4.2-SNAPSHOT</version.commonsApi>
 		
 		<version.corelib>2.15.4</version.corelib>
 		<version.annotationLd>1.1.9</version.annotationLd>