diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index b9cd75a..835171b 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,7 +5,7 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="workspace-tree-widget-6.8.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-BRANCH-6.8.0-SNAPSHOT/workspace-tree-widget-BRANCH-6.8.0-SNAPSHOT">
+        <dependent-module archiveName="workspace-tree-widget-6.8.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
             <dependency-type>uses</dependency-type>
         </dependent-module>
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
index 692d33f..15d1d2e 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
@@ -16,7 +16,6 @@ import org.gcube.portlets.user.workspace.client.event.OpenContextMenuTreeEvent;
 import org.gcube.portlets.user.workspace.client.event.OpenReportsEvent;
 import org.gcube.portlets.user.workspace.client.event.OpenUrlEvent;
 import org.gcube.portlets.user.workspace.client.event.StoreGridChangedEvent;
-import org.gcube.portlets.user.workspace.client.interfaces.GXTFolderItemTypeEnum;
 import org.gcube.portlets.user.workspace.client.model.FileGridModel;
 import org.gcube.portlets.user.workspace.client.model.FileModel;
 import org.gcube.portlets.user.workspace.client.model.GroupingStoreModel;
@@ -128,6 +127,12 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
 		          String val = model.get(property);  
 		          String color = "black";
 		          
+		          if(val==null || val.isEmpty())
+		        	  return "";
+		          
+		          return "<span qtitle='" + columnModel.getColumnById(property).getHeader() + "' qtip='" + val  + "' style='color:" + color + "'>" + val + "</span>";
+		          
+		          /*
 		          if(val != null && val.equals(GXTFolderItemTypeEnum.FOLDER.toString())){
 //		        	  color = "#EEC900";
 		        	  return "<span qtitle='" + columnModel.getColumnById(property).getHeader() + "' qtip='" + val  + "' style='font-weight: bold;color:" + color + "'>" + val + "</span>";
@@ -136,6 +141,8 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
 		        		  val = "";
 		        	  return "<span qtitle='" + columnModel.getColumnById(property).getHeader() + "' qtip='" + val  + "' style='color:" + color + "'>" + val + "</span>";
 		          }
+		          
+		          */
 			}  
 	      };