diff --git a/build4Etics.xml b/build4Etics.xml
index f7ab7cd..a854988 100755
--- a/build4Etics.xml
+++ b/build4Etics.xml
@@ -100,7 +100,7 @@ garname:  			Unique name of the GAR file to be generated. Defaults to $name.
 	<echo message="Stubs' JAR = ${jarfile.stubs}" level="info"/>
 
 	<!-- Build defaults -->
-	<property name="build.dir" location="${service.dir}/../build" />
+	<property name="build.dir" location="${service.dir}/build" />
 	<property name="build.class.dir" location="${build.dir}/classes" />
 	<property name="build.lib.dir" location="${build.dir}/lib" />
 	<property name="build.schema.dir" location="${build.dir}/schema" />
diff --git a/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java
index 1008740..93c3aa2 100644
--- a/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java
+++ b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java
@@ -56,7 +56,9 @@ public class RegistryFactoryResource extends GCUBEWSResource {
 		return RPNames;
 	}
 
-	protected static String[] RPNames = {ExternalRunningInstanceRP,
+	protected static String[] RPNames = {
+		RunningInstanceRP,
+		ExternalRunningInstanceRP,
 		ServiceRP,
 		CollectionRP,
 		CSRP,
diff --git a/org/gcube/informationsystem/registry/impl/core/ServiceContext.java b/org/gcube/informationsystem/registry/impl/core/ServiceContext.java
index f1ce4c5..efa742b 100644
--- a/org/gcube/informationsystem/registry/impl/core/ServiceContext.java
+++ b/org/gcube/informationsystem/registry/impl/core/ServiceContext.java
@@ -66,6 +66,7 @@ public class ServiceContext extends GCUBEServiceContext{
 		try {
 			client =  GHNContext.getImplementation(ISClient.class);
 			queryRI = client.getQuery(GCUBERIsFromClassAndName.class);
+			queryGHN = client.getQuery(GCUBEResourceXPathQuery.class);
 		}catch (Exception e) {
 			e.printStackTrace();
 		}