diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceBackendQuery.java b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceBackendQuery.java
index 817d1f1..7767883 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceBackendQuery.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceBackendQuery.java
@@ -131,7 +131,9 @@ public interface AccountingPersistenceBackendQuery {
 			String topKey, String orderingProperty)
 					throws DuplicatedKeyFilterException, KeyException, ValueException, 
 					Exception;
-
+	
+	/*
+	@Deprecated
 	public SortedSet<NumberedFilter> getNextPossibleValues(
 			Class<? extends AggregatedRecord<?, ?>> clz,
 					TemporalConstraint temporalConstraint, List<Filter> filters,
@@ -139,11 +141,13 @@ public interface AccountingPersistenceBackendQuery {
 					DuplicatedKeyFilterException, KeyException, ValueException, 
 					Exception;
 	
+	@Deprecated
 	public SortedSet<NumberedFilter> getNextPossibleValuesWithMap(
 			Class<? extends AggregatedRecord<?, ?>> clz,
 			TemporalConstraint temporalConstraint, List<Filter> filters,
 			String key, String orderingProperty) throws Exception;
-
+	*/
+	
 	/**
 	 * Close the connection to persistence
 	 * 
@@ -152,7 +156,6 @@ public interface AccountingPersistenceBackendQuery {
 	 */
 	public void close() throws Exception;
 
-	@Deprecated
 	public SortedSet<NumberedFilter> getFilterValues(
 			Class<? extends AggregatedRecord<?, ?>> clz,
 					TemporalConstraint temporalConstraint, List<Filter> filters,
diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
index d78d933..78c9129 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
@@ -228,6 +228,7 @@ public class AccountingPersistenceQuery implements AccountingPersistenceBackendQ
 		return this.getTopValues(clz, temporalConstraint, filters, topKey, orderingProperty, false, 0);
 	}
 
+	/*
 	public SortedSet<NumberedFilter> getNextPossibleValues(Class<? extends AggregatedRecord<?, ?>> clz,
 			TemporalConstraint temporalConstraint, List<Filter> filters, String key)
 			throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
@@ -236,10 +237,12 @@ public class AccountingPersistenceQuery implements AccountingPersistenceBackendQ
 
 		return this.getNextPossibleValues(clz, temporalConstraint, filters, key, orderingProperty);
 	}
-
-	/**
+*/
+	
+	/* *
 	 * {@inheritDoc}
 	 */
+	/*
 	@Override
 	public SortedSet<NumberedFilter> getNextPossibleValues(Class<? extends AggregatedRecord<?, ?>> clz,
 			TemporalConstraint temporalConstraint, List<Filter> filters, String key, String orderingProperty)
@@ -249,10 +252,12 @@ public class AccountingPersistenceQuery implements AccountingPersistenceBackendQ
 				filters, key, orderingProperty);
 
 	}
-
-	/**
+	*/
+	
+	/* *
 	 * {@inheritDoc}
 	 */
+	/*
 	@Override
 	public SortedSet<NumberedFilter> getNextPossibleValuesWithMap(Class<? extends AggregatedRecord<?, ?>> clz,
 			TemporalConstraint temporalConstraint, List<Filter> filters, String key, String orderingProperty)
@@ -260,7 +265,8 @@ public class AccountingPersistenceQuery implements AccountingPersistenceBackendQ
 		return AccountingPersistenceBackendQueryFactory.getInstance().getNextPossibleValuesWithMap(clz,
 				temporalConstraint, filters, key, orderingProperty);
 	}
-
+	*/
+	
 	/**
 	 * {@inheritDoc}
 	 */
@@ -278,7 +284,6 @@ public class AccountingPersistenceQuery implements AccountingPersistenceBackendQ
 	}
 
 	@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, null);