diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/UpdateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/UpdateDatasetForm.java
index fda273c..8acb78c 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/UpdateDatasetForm.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/UpdateDatasetForm.java
@@ -452,12 +452,20 @@ public class UpdateDatasetForm extends Composite {
 								List<String> vocabularyTags = datasetBean.getTagsVocabulary();
 								if (vocabularyTags != null) {
 									tagsPanel.setVocabulary(vocabularyTags);
-									if (datasetBean.getTags() != null) {
-										for (String tag : datasetBean.getTags()) {
-											tagsPanel.addTagElement(tag);
-										}
-
+//									if (datasetBean.getTags() != null) {
+//										for (String tag : datasetBean.getTags()) {
+//											tagsPanel.addTagElement(tag);
+//										}
+//
+//									}
+								}
+								
+								//Settings the tags
+								if (datasetBean.getTags() != null) {
+									for (String tag : datasetBean.getTags()) {
+										tagsPanel.addTagElement(tag);
 									}
+
 								}
 
 								// THIS BLOCK is it required? Probably not.
@@ -510,15 +518,15 @@ public class UpdateDatasetForm extends Composite {
 								// force the selection of the first one, and retrieve the list of profiles
 								organizationsListbox.setSelectedIndex(0);
 
-								// add change handler to dynamically retrieve the list of profiles
-								organizationsListbox.addChangeHandler(new ChangeHandler() {
-
-									@Override
-									public void onChange(ChangeEvent event) {
-										event.preventDefault();
-										organizationsListboxChangeHandlerBody(operation);
-									}
-								});
+//								// add change handler to dynamically retrieve the list of profiles
+//								organizationsListbox.addChangeHandler(new ChangeHandler() {
+//
+//									@Override
+//									public void onChange(ChangeEvent event) {
+//										event.preventDefault();
+//										organizationsListboxChangeHandlerBody(operation);
+//									}
+//								});
 
 								// get the name of the organization from the title
 								final String orgName = nameTitleOrganizationMap
@@ -701,7 +709,7 @@ public class UpdateDatasetForm extends Composite {
 	 */
 
 	// NEVER USED IN UPDATE MODE
-	private void organizationsListboxChangeHandlerBody(OPERATION operation) {
+	/*private void organizationsListboxChangeHandlerBody(OPERATION operation) {
 
 		// remove any other product profiles
 		metadataTypeListbox.clear();
@@ -813,7 +821,7 @@ public class UpdateDatasetForm extends Composite {
 			}
 		});
 
-	}
+	}*/
 
 	/**
 	 * Add the items to the listbox and put data into the metadataPanel.