diff --git a/src/main/java/org/gcube/gcat/api/CMItemVisibility.java b/src/main/java/org/gcube/gcat/api/CMItemVisibility.java
index 5f45825..213bfcb 100644
--- a/src/main/java/org/gcube/gcat/api/CMItemVisibility.java
+++ b/src/main/java/org/gcube/gcat/api/CMItemVisibility.java
@@ -11,13 +11,13 @@ public enum CMItemVisibility {
 	RESTRICTED("restricted"),
 	PUBLIC("public");
 	
-	protected static final Map<String,CMItemStatus> CM_ITEM_VISIBILITY_FROM_VALUE;
+	protected static final Map<String,CMItemVisibility> CM_ITEM_VISIBILITY_FROM_VALUE;
 	
 	static {
 		CM_ITEM_VISIBILITY_FROM_VALUE = new HashMap<>();
 		
-		for(CMItemStatus s : CMItemStatus.values()) {
-			CM_ITEM_VISIBILITY_FROM_VALUE.put(s.getValue(), s);
+		for(CMItemVisibility v : CMItemVisibility.values()) {
+			CM_ITEM_VISIBILITY_FROM_VALUE.put(v.getValue(), v);
 		}
 	}
 	
@@ -31,7 +31,7 @@ public enum CMItemVisibility {
 		return value;
 	}
 	
-	public static CMItemStatus getCMItemStatusFromValue(String value) {
+	public static CMItemVisibility getCMItemStatusFromValue(String value) {
 		return CM_ITEM_VISIBILITY_FROM_VALUE.get(value);
 	}
 }
diff --git a/src/main/java/org/gcube/gcat/api/GCatConstants.java b/src/main/java/org/gcube/gcat/api/GCatConstants.java
index 6afd7ff..ed2b7f8 100644
--- a/src/main/java/org/gcube/gcat/api/GCatConstants.java
+++ b/src/main/java/org/gcube/gcat/api/GCatConstants.java
@@ -20,7 +20,8 @@ public class GCatConstants {
 	public static final String ORGANIZATION_PARAMETER = "organization";
 	public static final String Q_KEY = "q";
 	
-	public static final String SOCIAL_POST_PARAMETER = "social_post";
+	public static final String SOCIAL_POST_QUERY_PARAMETER = "social_post";
+	
 
 	public static final String ORGANIZATION_FILTER_TEMPLATE = ORGANIZATION_PARAMETER + ":%s";
 	
@@ -30,7 +31,8 @@ public class GCatConstants {
 	public static final String CATALOGUE_MODERATOR = "Catalogue-Moderator";
 	
 	/* Content Moderation fields */
-	public static final String CM_ITEM_STATUS = "system:cm_item_status";
-	public static final String CM_ITEM_VISIBILITY = "system:cm_item_visibility";
+	public static final String CM_ITEM_STATUS_QUERY_PARAMETER = "cm_item_status";
+	public static final String SYSTEM_CM_ITEM_STATUS = "system:cm_item_status";
+	public static final String SYSTEM_CM_ITEM_VISIBILITY = "system:cm_item_visibility";
 	
 }