diff --git a/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java b/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java
index e50e557..22a8d07 100644
--- a/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java
+++ b/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java
@@ -405,7 +405,7 @@ public class ItemsManager {
 
 					return Response
 							.ok(so)
-							.header("content-disposition","attachment; filename = \""+fileName+"\"")
+							.header("content-disposition","attachment; filename = "+fileName)
 							.header("Content-Length", size)
 							.header("Content-Type", mimeType)
 							.build();
@@ -500,7 +500,7 @@ public class ItemsManager {
 
 				response = Response
 						.ok(so)
-						.header("content-disposition","attachment; filename = \""+fileItem.getName()+"\"")
+						.header("content-disposition","attachment; filename = "+fileItem.getName())
 						.header("Content-Length", fileItem.getContent().getSize())
 						.header("Content-Type", fileItem.getContent().getMimeType())
 						.build();
@@ -530,7 +530,7 @@ public class ItemsManager {
 
 					response = Response
 							.ok(so)
-							.header("content-disposition","attachment; filename = \""+item.getTitle()+".zip\"")
+							.header("content-disposition","attachment; filename = "+item.getTitle()+".zip")
 							.header("Content-Type", "application/zip")
 							.header("Content-Length", -1l)
 							.build();
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 2c5cc4b..2983037 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -10,7 +10,7 @@
 	</context-param>
 	<context-param>
 		<param-name>resolver-basepath</param-name>
-		<param-value>https://data1-d.d4science.net/shub</param-value>
+		<param-value>https://data-d.d4science.net/shub</param-value>
 	</context-param>
 	<servlet>
 		<servlet-name>org.gcube.data.access.storagehub.StorageHub</servlet-name>