diff --git a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java
index 5b88291..3da9342 100644
--- a/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/openwidget/client/TabResourcesSelectionPanel.java
@@ -77,7 +77,7 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
 		HasSelectionHandlers<TabResource> {
 
 	interface NameTooltipTemplates extends XTemplates {
-		@XTemplate("<span qtip=\"{value}\" qtitle=\"Format {desc}\">{value}</span>")
+		@XTemplate("<span qtip=\"{desc}\" qtitle=\"{value}\">{value}</span>")
 		SafeHtml format(String value, String desc);
 
 	}
@@ -165,6 +165,8 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
 
 		ColumnConfig<TabResource, String> nameColumn = new ColumnConfig<TabResource, String>(
 				properties.name(), 90, "Name");
+		
+		
 		/*
 		nameColumn.setCell(
 		new AbstractCell<String>() {
@@ -174,8 +176,17 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
 				TabResource tabResource=store.get(context.getIndex());
 				
 				final NameTooltipTemplates nameToolTipTemplates = GWT
-						.create(NameTooltipTemplates.class);				
-				sb.append(nameToolTipTemplates.format(value, tabResource.getDescription()));
+						.create(NameTooltipTemplates.class);
+				String valueSafe="";
+				String descriptionSafe="";
+				
+				if(value!=null){		
+						valueSafe=SafeHtmlUtils.htmlEscape(value);
+				}
+				if(tabResource!=null && tabResource.getAgency()!=null){
+					descriptionSafe=SafeHtmlUtils.htmlEscape(tabResource.getAgency());
+				}
+				sb.append(nameToolTipTemplates.format(valueSafe, descriptionSafe));
 
 			}
 		});*/
@@ -252,6 +263,8 @@ public class TabResourcesSelectionPanel extends ContentPanel implements
 			}
 		};
 		
+	
+		
 
 		sm.setSelectionMode(SelectionMode.SINGLE);
 		grid.setLoader(loader);