diff --git a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/table/TableTypeStore.java b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/table/TableTypeStore.java
index 850fa61..4e61aed 100644
--- a/src/main/java/org/gcube/portlets/user/td/informationwidget/client/table/TableTypeStore.java
+++ b/src/main/java/org/gcube/portlets/user/td/informationwidget/client/table/TableTypeStore.java
@@ -30,10 +30,10 @@ public class TableTypeStore {
 			return genericElement;
 		} else {
 			if(tableType.compareTo(TableType.CODELIST.toString())==0){
-				return genericElement;
+				return codelistElement;
 			} else {
 				if(tableType.compareTo(TableType.DATASET.toString())==0){
-					return genericElement;
+					return datasetElement;
 				} else {
 					return null;
 				}