diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
index 22fd71e..ca1ac18 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/form/CreateDatasetForm.java
@@ -1380,8 +1380,7 @@ public class CreateDatasetForm extends Composite{
 	}
 
 	/**
-	 * Disable dataset editable fields once the dataset has been
-	 * Successfully created.
+	 * Disable dataset editable fields once the dataset has been successfully created.
 	 */
 	protected void disableDatasetFields() {
 
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java
index fafadbc..be73c00 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/metadata/MetaDataFieldSkeleton.java
@@ -116,6 +116,7 @@ public class MetaDataFieldSkeleton extends Composite{
 				((CheckBox)holder).setValue(Boolean.valueOf(field.getDefaultValue()));
 			break;
 
+		case GeoJSON:
 		case Text:	
 
 			holder = new TextArea();
@@ -352,6 +353,7 @@ public class MetaDataFieldSkeleton extends Composite{
 			return null;
 
 		case Text:	
+		case GeoJSON: // validation for geojson will be performed at server side as well TODO
 
 			String textAreaValue = getFieldCurrentValue();
 
@@ -510,7 +512,7 @@ public class MetaDataFieldSkeleton extends Composite{
 			break;
 
 		case Text:	
-
+		case GeoJSON:
 			toReturn = ((TextArea)holder).getText();
 			break;
 
@@ -609,6 +611,7 @@ public class MetaDataFieldSkeleton extends Composite{
 			((CheckBox)holder).setEnabled(false);
 			break;
 
+		case GeoJSON:
 		case Text:	
 
 			((TextArea)holder).setEnabled(false);