diff --git a/pom.xml b/pom.xml
index 5e6d8c1..e65f9c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,18 +131,6 @@
 			<artifactId>common-smartgears</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.gcube.common</groupId> -->
-		<!-- <artifactId>home-library</artifactId> -->
-		<!-- <version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> -->
-		<!-- <scope>compile</scope> -->
-		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
-			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
-			<version>${version.jersey}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>de.grundid.opendatalab</groupId>
 			<artifactId>geojson-jackson</artifactId>
@@ -158,6 +146,12 @@
 			<artifactId>commons-lang</artifactId>
 			<version>2.3</version>
 		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
+			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+			<version>${version.jersey}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 
diff --git a/src/main/java/org/gcube/datacatalogue/catalogue/utils/GcoreEndpointReaderSNL.java b/src/main/java/org/gcube/datacatalogue/catalogue/utils/GcoreEndpointReaderSNL.java
index f02fb64..4763926 100644
--- a/src/main/java/org/gcube/datacatalogue/catalogue/utils/GcoreEndpointReaderSNL.java
+++ b/src/main/java/org/gcube/datacatalogue/catalogue/utils/GcoreEndpointReaderSNL.java
@@ -39,10 +39,10 @@ public class GcoreEndpointReaderSNL {
 
 		try{
 			SimpleQuery query = queryFor(GCoreEndpoint.class);
-			query.addCondition(String.format("$RESOURCE/Profile/SERVICE_CLASSE/text() eq '%s'",SERVICE_CLASSE));
-			query.addCondition("$RESOURCE/Profile/DeploymentData/Status/text() eq 'ready'");
-			query.addCondition(String.format("$RESOURCE/Profile/SERVICE_NAME/text() eq '%s'",SERVICE_NAME));
-			query.setResult("$RESOURCE/Profile/AccessPoint/RunningInstanceInterfaces//Endpoint[@EntryName/string() eq \""+RESOURCE+"\"]/text()");
+			query.addCondition(String.format("$resource/Profile/ServiceClass/text() eq '%s'",SERVICE_CLASSE));
+			query.addCondition("$resource/Profile/DeploymentData/Status/text() eq 'ready'");
+			query.addCondition(String.format("$resource/Profile/ServiceName/text() eq '%s'",SERVICE_NAME));
+			query.setResult("$resource/Profile/AccessPoint/RunningInstanceInterfaces//Endpoint[@EntryName/string() eq \""+RESOURCE+"\"]/text()");
 
 			DiscoveryClient<String> client = client();
 			List<String> endpoints = client.submit(query);