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 c347074..787eac8 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
@@ -130,7 +130,24 @@ public class AccountingPersistenceQuery implements AccountingPersistenceBackendQ
 				objectNode.put(key, 0);
 			}
 		}else {
-			
+			Set<String> keys = clz.newInstance().getAggregatedFields();
+			for(String key : keys) {
+				switch (key) {
+					case AggregatedRecord.START_TIME:
+						break;
+					
+					case AggregatedRecord.END_TIME:
+						break;
+					
+					case AggregatedRecord.AGGREGATED:
+						break;
+						
+					default:
+						objectNode.put(key, 0);
+						break;
+				}
+				
+			}
 		}
 		return objectNode;
 	}