diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java
index 3642e71..7e69b46 100644
--- a/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java
+++ b/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java
@@ -172,13 +172,16 @@ public class GeonetworkResolver {
 			try {
 				
 				GeonetworkAccessParameter gntwAccess = new GeonetworkAccessParameter(scope);
-				GeonetworkInstance gnInstance = gntwAccess.getGeonetworkInstance(true, null,null);
+				//GeonetworkInstance gnInstance = gntwAccess.getGeonetworkInstance(true, null,null);
+				
+				GeonetworkInstance gnInstance = getGeonetworkInstanceForScope(scope, null, null);
 
 				ScopeProvider.instance.set(scope);
 
 				HTTPCallsUtils httpUtils = new HTTPCallsUtils();
-				Configuration config = gnInstance.getGeonetworkPublisher().getConfiguration();
-				String geonetworkUrl = config.getGeoNetworkEndpoint();
+				//Configuration config = gnInstance.getGeonetworkPublisher().getConfiguration();
+				//String geonetworkUrl = config.getGeoNetworkEndpoint();
+				String geonetworkUrl = gnInstance.getEndPoint();
 				String baseURL = remainPath==null ||remainPath.isEmpty()?geonetworkUrl+"/"+CSW_SERVER:geonetworkUrl+"/"+CSW_SERVER+remainPath;
 				logger.info("The base URL is: "+baseURL);
 				String queryString = req.getQueryString()==null || req.getQueryString().isEmpty()?"":"?"+req.getQueryString();