diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
index 7b79487..f110307 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
@@ -1181,9 +1181,10 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	}
 	
 	@Override
+	@Deprecated
 	public SortedSet<NumberedFilter> getFilterValues(Class<? extends AggregatedRecord<?, ?>> clz,
 			TemporalConstraint temporalConstraint, List<Filter> filters, String key) throws Exception {
-		return getFilterValues(clz, temporalConstraint, filters, key, 100);
+		return getFilterValues(clz, temporalConstraint, filters, key, null);
 	}
 
 	/**
@@ -1198,7 +1199,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 */
 	@Override
 	public SortedSet<NumberedFilter> getFilterValues(Class<? extends AggregatedRecord<?, ?>> clz,
-			TemporalConstraint temporalConstraint, List<Filter> filters, String key, int limit) throws Exception {
+			TemporalConstraint temporalConstraint, List<Filter> filters, String key, Integer limit) throws Exception {
 
 		String currentScope = ScopeProvider.instance.get();
 
@@ -1218,7 +1219,9 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 		query.groupLevel(groupLevel);
 		query.startKey(startKey);
 		query.descending(false);
-		query.limit(limit);
+		if(limit !=null){
+			query.limit(limit);
+		}
 
 		String orderingProperty = AccountingPersistenceQuery.getDefaultOrderingProperties(clz);
 
diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java
index 1fdfa89..e3899dc 100644
--- a/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java
+++ b/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java
@@ -639,7 +639,7 @@ public class AccountingPersistenceQueryCouchBaseTest extends ScopedTest {
 		String key="dataServiceId";
 		
 		SortedSet<NumberedFilter>  listFilterValue =
-				accountingPersistenceQueryCouchBase.getFilterValues(AggregatedStorageStatusRecord.class, null, null, key);
+				accountingPersistenceQueryCouchBase.getFilterValues(AggregatedStorageStatusRecord.class, null, null, key, null);
 		logger.debug("Result final{}", listFilterValue);
 		
 	}