diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/datamodel/Row.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/datamodel/Row.java
index 1b01762..735b4f4 100644
--- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/datamodel/Row.java
+++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/datamodel/Row.java
@@ -45,9 +45,11 @@ public class Row extends BaseModelData implements Serializable {
 	//
 	// }
 
-	public Row(List<String> attributes, List<String> values) {
+	public Row(List<String> attributes, List<String> values, int index) {
 
-		set("index", ID++);
+//		set("index", ID++);
+		
+		set("index", index);
 
 //		System.out.println("setting Row value");
 
diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/toolbar/GxtToolbarFunctionality.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/toolbar/GxtToolbarFunctionality.java
index 0a12cc7..4a221d0 100644
--- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/toolbar/GxtToolbarFunctionality.java
+++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/toolbar/GxtToolbarFunctionality.java
@@ -90,7 +90,7 @@ public class GxtToolbarFunctionality {
 		// toolBar.add(btnGetInfo);
 
 		// Button to get the "show create table"
-		btnShowCreateTable = new Button(ConstantsPortlet.SHOWCREATETABLE);
+		btnShowCreateTable = new Button(ConstantsPortlet.TABLEDETAILS);
 		btnShowCreateTable.setScale(ButtonScale.SMALL);
 		btnShowCreateTable.setArrowAlign(ButtonArrowAlign.BOTTOM);
 		toolBar.add(btnShowCreateTable);
@@ -170,7 +170,7 @@ public class GxtToolbarFunctionality {
 
 										// System.out.println("button OK event");
 
-										dialog.mask("Loading", "x-mask-loading");
+//										dialog.mask("Loading", "x-mask-loading");
 
 //										dialog.hide();
 
@@ -456,6 +456,8 @@ public class GxtToolbarFunctionality {
 			MessageBox.alert("Warning", "Query field null", null);
 
 		} else {
+			
+			dialog.mask("Loading", "x-mask-loading");
 
 			eventBus.fireEvent(new SubmitQueryEvent());
 		}
diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/utils/ConstantsPortlet.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/utils/ConstantsPortlet.java
index 2011f7d..a7d73eb 100644
--- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/utils/ConstantsPortlet.java
+++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/utils/ConstantsPortlet.java
@@ -9,7 +9,7 @@ public class ConstantsPortlet {
 	//Toolbar button
 	public static final String SUBMITQUERY = "Submit Query";
 	public static final String GETINFO = "Get Info";
-	public static final String SHOWCREATETABLE = "Show Create Table";
+	public static final String TABLEDETAILS = "Table Details";
 //	public static final String SIMPLESAMPLE = "Simple Sample";
 //	public static final String SMARTSAMPLE = "Smart Sample";
 //	public static final String RANDOMSAMPLE = "Random Sample";
diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java
index de8c4fa..22f913f 100644
--- a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java
@@ -835,7 +835,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
 
 				List<String> attrValues = parse(result.get(i).getValue());
 
-				Row element = new Row(attrNames, attrValues);
+				Row element = new Row(attrNames, attrValues, i);
 
 				rows.add(element);