diff --git a/.classpath b/.classpath
index e6330f5..3de64d4 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-codelistmapping-import-widget-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-codelistmapping-import-widget-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/tabular-data-codelistmapping-import-widget-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-codelistmapping-import-widget-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -33,5 +33,5 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/tabular-data-codelistmapping-import-widget-1.7.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-codelistmapping-import-widget-1.8.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index c9d699a..ead4a37 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.tabular-data-codelistmapping-import-widget.1-8-0"
+		date="2017-02-15">
+		<Change>Updated to new PortalContext [task #6548]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.tabular-data-codelistmapping-import-widget.1-7-0"
 		date="2015-10-15">
 		<Change>Added support to WorkspaceExplorer[ticket #428]</Change>
diff --git a/pom.xml b/pom.xml
index f6fc92f..a54df10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-codelistmapping-import-widget</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 
 	<name>tabular-data-codelistmapping-import-widget</name>
 	<description>tabular-data-codelistmapping-import-widget allows import from url, file and workspace of maps for codelist</description>
diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingFileUploadPanel.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingFileUploadPanel.java
index d7c0ef7..895f070 100644
--- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingFileUploadPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingFileUploadPanel.java
@@ -3,9 +3,11 @@
  */
 package org.gcube.portlets.user.td.codelistmappingimportwidget.client;
 
+import org.gcube.portal.clientcontext.client.GCubeClientContext;
 import org.gcube.portlets.user.td.codelistmappingimportwidget.client.progress.FileUploadProgressBarUpdater;
 import org.gcube.portlets.user.td.codelistmappingimportwidget.client.progress.FileUploadProgressListener;
 import org.gcube.portlets.user.td.codelistmappingimportwidget.client.progress.FileUploadProgressUpdater;
+import org.gcube.portlets.user.td.gwtservice.shared.Constants;
 import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
 import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages;
 import org.gcube.portlets.user.td.wizardwidget.client.dataresource.ResourceBundle;
@@ -145,7 +147,8 @@ public class CodelistMappingFileUploadPanel extends FormPanel {
 						|| fileUploadField.getValue().equals("")) {
 					Log.info("fileUploadField is null or empty");
 					AlertMessageBox alertMessageBox = new AlertMessageBox(
-							msgsCommon.attention(), msgs.attentionSpecifyAXmlFile());
+							msgsCommon.attention(), msgs
+									.attentionSpecifyAXmlFile());
 					alertMessageBox.show();
 					return;
 				} else {
@@ -172,8 +175,8 @@ public class CodelistMappingFileUploadPanel extends FormPanel {
 
 			public void operationFailed(Throwable caught, String reason,
 					String failureDetails) {
-				card.showErrorAndHide(msgs.errorUploadingTheXMLFileHead(), reason,
-						"", caught);
+				card.showErrorAndHide(msgs.errorUploadingTheXMLFileHead(),
+						reason, "", caught);
 			}
 
 			public void operationComplete() {
@@ -190,7 +193,8 @@ public class CodelistMappingFileUploadPanel extends FormPanel {
 
 		StringBuilder actionUrl = new StringBuilder();
 		actionUrl.append(GWT.getModuleBaseURL());
-		actionUrl.append(UPLOAD_SERVLET);
+		actionUrl.append(UPLOAD_SERVLET + "?" + Constants.CURR_GROUP_ID + "="
+				+ GCubeClientContext.getCurrentContextId());
 		setAction(actionUrl.toString());
 		Log.info("Start Upload action Url " + actionUrl.toString());
 		submit();