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 9b39f91..7b79487 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
@@ -1179,6 +1179,12 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 		Bucket bucket = getBucket((Class<? extends UsageRecord>) clz);
 		return String.format("%s.%s", bucket.name(), property);
 	}
+	
+	@Override
+	public SortedSet<NumberedFilter> getFilterValues(Class<? extends AggregatedRecord<?, ?>> clz,
+			TemporalConstraint temporalConstraint, List<Filter> filters, String key) throws Exception {
+		return getFilterValues(clz, temporalConstraint, filters, key, 100);
+	}
 
 	/**
 	 * Used for list a possible values for each filter
@@ -1192,7 +1198,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 */
 	@Override
 	public SortedSet<NumberedFilter> getFilterValues(Class<? extends AggregatedRecord<?, ?>> clz,
-			TemporalConstraint temporalConstraint, List<Filter> filters, String key) throws Exception {
+			TemporalConstraint temporalConstraint, List<Filter> filters, String key, int limit) throws Exception {
 
 		String currentScope = ScopeProvider.instance.get();
 
@@ -1212,6 +1218,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 		query.groupLevel(groupLevel);
 		query.startKey(startKey);
 		query.descending(false);
+		query.limit(limit);
 
 		String orderingProperty = AccountingPersistenceQuery.getDefaultOrderingProperties(clz);