diff --git a/enunciate.xml b/enunciate.xml
index f5ceb70..5908c4d 100644
--- a/enunciate.xml
+++ b/enunciate.xml
@@ -3,14 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.14.0.xsd">
     <api-classes>
-        <!-- Use patterns to exclude classes...
-        e.g. for URI-Resolver
-        <exclude pattern="org.gcube.datatransfer.resolver.services.UriResolverDocs" />
-        <exclude pattern="org.gcube.datatransfer.resolver.services.UriResolverIndex" />
-        <exclude pattern="org.gcube.datatransfer.resolver.services.UriResolverInfo" />
-        <exclude pattern="org.gcube.datatransfer.resolver.services.tobackward.BackCatalogueResolver" />
-        <exclude pattern="org.gcube.datatransfer.resolver.services.tobackward.BackUriResolverCatalogueResolver" />
-        -->
+    	<exclude pattern="org.gcube.gcat.rest.Docs" />
     </api-classes>
     <modules>
         <gwt-json-overlay disabled="true " />
@@ -18,6 +11,6 @@
         <ruby-json-client disabled="true" />
         <java-json-client disabled="true" />
         <javascript-client disabled="true" />
-        <docs docsDir="${project.build.directory}" docsSubdir="docs" />
+        <docs docsDir="${project.build.directory}/docs" />
     </modules>
 </enunciate>
\ No newline at end of file
diff --git a/src/main/java/org/gcube/gcat/rest/Docs.java b/src/main/java/org/gcube/gcat/rest/Docs.java
index 835735d..769681d 100644
--- a/src/main/java/org/gcube/gcat/rest/Docs.java
+++ b/src/main/java/org/gcube/gcat/rest/Docs.java
@@ -24,7 +24,7 @@ public class Docs {
 	private static Logger logger = LoggerFactory.getLogger(Docs.class);
 
 	@GET
-	@Path("{any: .{0,}}")
+	@Path("{any: .*}")
 	public InputStream toDoc(@Context HttpServletRequest req) throws WebApplicationException {
 		
 		String pathInfo = req.getPathInfo();