diff --git a/.classpath b/.classpath
index 3b74c7a..78db035 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-table-widget-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-table-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-table-widget-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-table-widget-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -44,5 +44,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/tabular-data-table-widget-1.7.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-table-widget-1.8.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 6cd1419..90b0643 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,7 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.tabular-data-table-widget.1-8-0" date="2017-02-15">
+		<Change>Updated to PortalContext [ticket #6548]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.tabular-data-table-widget.1-7-0" date="2015-07-03">
 		<Change>Added Delete Validations</Change>
 		<Change>Updated Dependencies</Change>
diff --git a/pom.xml b/pom.xml
index d580371..2f04a7e 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-table-widget</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 
 
 	<name>tabular-data-table-widget</name>
diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/RowsDataClient.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/RowsDataClient.java
index 661171d..2abc7f7 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/RowsDataClient.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/rows/RowsDataClient.java
@@ -1,5 +1,8 @@
 package org.gcube.portlets.user.td.tablewidget.client.rows;
 
+import org.gcube.portal.clientcontext.client.GCubeClientContext;
+import org.gcube.portlets.user.td.gwtservice.shared.Constants;
+
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.http.client.Request;
@@ -10,16 +13,20 @@ import com.google.gwt.http.client.Response;
 
 /**
  * 
- * @author giancarlo
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * @author giancarlo email: <a
+ *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
  *
  */
 public class RowsDataClient {
-	public void retrievesRowsAsJson()  {
+	private static final String TDWXROWSDATA = "tdwxrowsdata";
+
+	public void retrievesRowsAsJson() {
 		// Send request to server and catch any errors.
-		String path = GWT.getModuleBaseURL() + "tdwxrowsdata";
+		String path = GWT.getModuleBaseURL() + TDWXROWSDATA;
 		RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, path);
-		
+		builder.setHeader(Constants.CURR_GROUP_ID,
+				GCubeClientContext.getCurrentContextId());
+
 		try {
 			Request request = builder.sendRequest(null, new RequestCallback() {
 				public void onError(Request request, Throwable exception) {
@@ -32,7 +39,7 @@ public class RowsDataClient {
 					}
 				}
 			});
-			Log.debug("Request: "+request.toString());
+			Log.debug("Request: " + request.toString());
 		} catch (RequestException e) {
 			e.printStackTrace();
 		}