diff --git a/pom.xml b/pom.xml
index ece947c..5a72e1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
1.7
1.7
-
UTF-8
UTF-8
diff --git a/src/main/java/org/gcube/resourcemanagement/support/client/utils/CurrentStatus.java b/src/main/java/org/gcube/resourcemanagement/support/client/utils/CurrentStatus.java
index bb98fb2..658ac22 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/client/utils/CurrentStatus.java
+++ b/src/main/java/org/gcube/resourcemanagement/support/client/utils/CurrentStatus.java
@@ -25,6 +25,7 @@ import org.gcube.resourcemanagement.support.shared.types.UserGroup;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.HandlerManager;
+import com.google.gwt.user.client.Window;
/**
* @author Daniele Strollo (ISTI-CNR)
@@ -65,7 +66,7 @@ public final class CurrentStatus implements Serializable {
return currentScope;
}
- public void setCurrentResourceType(final String resType) {
+ public void setCurrentResourceType(String resType) {
if (resType != null) {
currentResourceType = resType.trim();
} else {
diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getResourceByID.xq b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getResourceByID.xq
index 316ff83..9a394d6 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getResourceByID.xq
+++ b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getResourceByID.xq
@@ -1,3 +1,4 @@
-for $resource in collection('/db/Profiles/')//Resource
+declare namespace ic = 'http://gcube-system.org/namespaces/informationsystem/registry';
+for $resource in collection('/db/Profiles/')//Document/Data/ic:Profile/Resource
where $resource/ID/string() eq ''
return $resource
\ No newline at end of file
diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getTypes.xq b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getTypes.xq
index 031cffa..6b5dc34 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getTypes.xq
+++ b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/getTypes.xq
@@ -1,4 +1,4 @@
-
-let $entry0ValueAuth := collection("/db/Profiles")//Resource
-for $types in distinct-values($entry0ValueAuth//Resource/Type/text())
+declare namespace ic = 'http://gcube-system.org/namespaces/informationsystem/registry';
+let $entry0ValueAuth := collection("/db/Profiles")//Document/Data/ic:Profile/Resource
+for $types in distinct-values($entry0ValueAuth/Type/text())
return {$types}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GenericResource.xq b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GenericResource.xq
index 02a3ebb..15d40c2 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GenericResource.xq
+++ b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/GenericResource.xq
@@ -1,6 +1,7 @@
-for $profiles in collection('/db/Profiles/GenericResource')//Resource
+declare namespace ic = 'http://gcube-system.org/namespaces/informationsystem/registry';
+for $profiles in collection('/db/Profiles/GenericResource')//Document/Data/ic:Profile/Resource
let $scopes := string-join( $profiles/Scopes//Scope/text(), ';')
-let $subtype := $profiles//Resource/Profile/SecondaryType/text()
+let $subtype := $profiles/Profile/SecondaryType/text()
return
\ No newline at end of file