diff --git a/src/main/java/org/gcube/data/access/connector/GeoServerConnectorRequestHandler.java b/src/main/java/org/gcube/data/access/connector/GeoServerConnectorRequestHandler.java
index c44944a..27f1e0c 100644
--- a/src/main/java/org/gcube/data/access/connector/GeoServerConnectorRequestHandler.java
+++ b/src/main/java/org/gcube/data/access/connector/GeoServerConnectorRequestHandler.java
@@ -163,7 +163,8 @@ public class GeoServerConnectorRequestHandler extends RequestHandler {
 
 			List<GCoreEndpoint> gCoreEndpoints = client.submit(query);
 
-			if (gCoreEndpoints.size() > 1) {			
+			if (gCoreEndpoints.size() > 1) {	
+				//TODO remove gCoreEndpoints.size() and use the first (only) item
 				System.out.println("******************************* SIZE = " + gCoreEndpoints.size());
 				GCoreEndpoint gCoreEndpoint = gCoreEndpoints.get(gCoreEndpoints.size() - 1);
 				return gCoreEndpoint.profile().endpointMap().get("org.gcube.spatial.data.sdi.SDIService").uri().toString();