diff --git a/src/main/java/org/gcube/common/clients/gcore/queries/GCoreQuery.java b/src/main/java/org/gcube/common/clients/gcore/queries/GCoreQuery.java
index a3e387e..68cf85b 100644
--- a/src/main/java/org/gcube/common/clients/gcore/queries/GCoreQuery.java
+++ b/src/main/java/org/gcube/common/clients/gcore/queries/GCoreQuery.java
@@ -31,10 +31,6 @@ public abstract class GCoreQuery<R> extends AbstractQuery<EndpointReferenceType,
 		super(plugin);
 		
 		this.facade=facade;
-		
-		//adds systematically base conditions
-		addCondition("//ServiceName", plugin.serviceName());
-		addCondition("//ServiceClass", plugin.serviceClass());
 	}
 	
 	/**
diff --git a/src/main/java/org/gcube/common/clients/gcore/queries/StatefulQuery.java b/src/main/java/org/gcube/common/clients/gcore/queries/StatefulQuery.java
index 212901b..9a31205 100644
--- a/src/main/java/org/gcube/common/clients/gcore/queries/StatefulQuery.java
+++ b/src/main/java/org/gcube/common/clients/gcore/queries/StatefulQuery.java
@@ -26,6 +26,10 @@ public final class StatefulQuery extends GCoreQuery<RPDocument> {
 	 */
 	public StatefulQuery(ISFacade facade, Plugin<?,?> plugin) {
 		super(facade,plugin);
+		
+		//adds systematically base conditions
+		addCondition("//gc:ServiceName", plugin.serviceName());
+		addCondition("//gc:ServiceClass", plugin.serviceClass());
 	}
 	
 	/**
diff --git a/src/main/java/org/gcube/common/clients/gcore/queries/StatelessQuery.java b/src/main/java/org/gcube/common/clients/gcore/queries/StatelessQuery.java
index 9d32cc2..bec5d0a 100644
--- a/src/main/java/org/gcube/common/clients/gcore/queries/StatelessQuery.java
+++ b/src/main/java/org/gcube/common/clients/gcore/queries/StatelessQuery.java
@@ -30,6 +30,10 @@ public final class StatelessQuery extends GCoreQuery<GCUBERunningInstance> {
 	 */
 	public StatelessQuery(ISFacade runner,Plugin<?,?> plugin) {
 		super(runner,plugin);
+		
+		//adds systematically base conditions
+		addCondition("//ServiceName", plugin.serviceName());
+		addCondition("//ServiceClass", plugin.serviceClass());
 	}
 	
 	/**