diff --git a/src/main/java/org/gcube/application/geoportalcommon/geoportal/UseCaseDescriptorCaller.java b/src/main/java/org/gcube/application/geoportalcommon/geoportal/UseCaseDescriptorCaller.java
index 9cb4b91..49efe2c 100644
--- a/src/main/java/org/gcube/application/geoportalcommon/geoportal/UseCaseDescriptorCaller.java
+++ b/src/main/java/org/gcube/application/geoportalcommon/geoportal/UseCaseDescriptorCaller.java
@@ -79,13 +79,16 @@ public class UseCaseDescriptorCaller {
 //		LOG.debug("Performing query: {}", queryDoc.toJson());
 //		queryRequest.setFilter(queryDoc);
 
-		Iterator<UseCaseDescriptor> useCaseDescrs = client.query(queryRequest);
-		for (Iterator<UseCaseDescriptor> iterator = useCaseDescrs; useCaseDescrs.hasNext();) {
-			UseCaseDescriptor prg = (UseCaseDescriptor) iterator.next();
-			listUCD.add(prg);
-
+		Iterator<UseCaseDescriptor> useCaseDescrsIt = client.query(queryRequest);
+		
+		if(useCaseDescrsIt!=null) {
+			while(useCaseDescrsIt.hasNext()) {
+				UseCaseDescriptor prg = (UseCaseDescriptor) useCaseDescrsIt.next();
+				listUCD.add(prg);
+	
+			}
 		}
-		LOG.info("returning {} {}", listUCD.size(), UseCaseDescriptor.class.getName());
+		LOG.info("getListForJSONPath returning {} {}", listUCD.size(), UseCaseDescriptor.class.getName());
 		return listUCD;
 	}
 
diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/UseCaseDescriptorDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/UseCaseDescriptorDV.java
index b62421d..3aa739e 100644
--- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/UseCaseDescriptorDV.java
+++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/UseCaseDescriptorDV.java
@@ -9,7 +9,7 @@ public class UseCaseDescriptorDV implements Serializable {
 	 * 
 	 */
 	private static final long serialVersionUID = -2864888245002804887L;
-	private String id;
+	private String id; // this is the ProfileID
 	private String version;
 	private String name;
 	private String description;
@@ -31,6 +31,10 @@ public class UseCaseDescriptorDV implements Serializable {
 		return id;
 	}
 
+	public String getProfileID() {
+		return id;
+	}
+
 	public String getVersion() {
 		return version;
 	}