diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
index 331fdc1..ef14c7d 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
@@ -2515,25 +2515,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 
 	/**
 	 * 
+	 * @param service
 	 * @param tr
-	 * @throws TDGWTServiceException
-	 *
-	 *             private TabResource
-	 *             retrieveTRMetadataFromServiceAndLastTable( TabularDataService
-	 *             service, TabularResource tr) throws TDGWTServiceException {
-	 *             return retrieveTRMetadataFromServiceAndLastTable(service, tr,
-	 *             0); }
-	 */
-
-	/**
-	 * Retrieves the informations for a specific Tabular Resource from service
-	 * without table id (fast)
-	 * 
-	 * @param tr
-	 *            TabularResource on service
 	 * @param i
-	 *            Index on Grid
-	 * @return TabResource for Grid
+	 * @return
 	 * @throws TDGWTServiceException
 	 */
 	private TabResource retrieveTRMetadataFromService(
@@ -2630,11 +2615,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 	 * Retrieves the informations for a specific Tabular Resource and the Last
 	 * Table from service
 	 * 
+	 * 
+	 * @param service
 	 * @param tr
-	 *            TabularResource on service
 	 * @param i
-	 *            Index on Grid
-	 * @return TabResource for Grid
+	 * @return
 	 * @throws TDGWTServiceException
 	 */
 	private TabResource retrieveTRMetadataFromServiceAndLastTable(
@@ -6146,7 +6131,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 					Long.valueOf(templateApplySession.getTrId().getId()));
 			TabularResource tabularResource = service
 					.getTabularResource(tabularResourceId);
-
+			
+			checkTabularResourceIsFlow(tabularResource);
 			checkTabularResourceLocked(tabularResource);
 			checkTabularResourceIsFinal(tabularResource);
 
@@ -8567,7 +8553,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 					Long.valueOf(mapCreationSession.getTrId().getId()));
 			TabularResource tabularResource = service
 					.getTabularResource(tabularResourceId);
-
+			
+			checkTabularResourceIsFlow(tabularResource);
 			checkTabularResourceLocked(tabularResource);
 
 			OpExecution4MapCreation opEx = new OpExecution4MapCreation(service,
@@ -8691,7 +8678,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 							.getId()));
 			TabularResource tabularResource = service
 					.getTabularResource(tabularResourceId);
-
+			
+			checkTabularResourceIsFlow(tabularResource);
 			checkTabularResourceLocked(tabularResource);
 
 			OpExecution4ChartTopRating opEx = new OpExecution4ChartTopRating(