diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java
index aeb797a..9f7a5aa 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/ActiveFiltersPanel.java
@@ -434,7 +434,7 @@ public class ActiveFiltersPanel extends SimpleContainer {
 
 			@Override
 			public void render(Context context, String value, SafeHtmlBuilder sb) {
-				sb.appendHtmlConstant("<span title='"
+				sb.appendHtmlConstant("<span style='white-space: normal;' title='"
 						+ SafeHtmlUtils.htmlEscape(value) + "'>"
 						+ SafeHtmlUtils.htmlEscape(value) + "</span>");
 
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java
index 0f62103..bab5d4c 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java
@@ -121,7 +121,7 @@ public class SessionUtil {
 			if (Constants.DEBUG_MODE) {
 				contexts.add(aslSession.getScope());
 				for(int i=0; i<50 ; i++){
-					contexts.add(aslSession.getScope()+i);
+					contexts.add("/d4science.research-infrastructures.eu/gCubeApps/PerformanceEvaluationInAquaculture"+i);
 				}
 			} else {
 				contexts.add(aslSession.getScope());
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerTester.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerTester.java
index 126fd0e..5dfd4ce 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerTester.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerTester.java
@@ -79,7 +79,7 @@ public class AccountingCallerTester implements AccountingCallerInterface {
 			filterKeys.add(key);
 			
 			for (int i = 0; i < 20; i++) {
-				key = new FilterKey("ServiceClass" + i);
+				key = new FilterKey("ServiceName" + i);
 				filterKeys.add(key);
 			}