diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/DocumentDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/DocumentDV.java
index 4d767c3..4c845f2 100644
--- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/DocumentDV.java
+++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/DocumentDV.java
@@ -24,7 +24,7 @@ public class DocumentDV implements Serializable {
 	}
 
 	public Entry<String, Object> getFirstEntryOfMap() {
-		if (documentAsMap != null && documentAsMap.size() > 1) {
+		if (documentAsMap != null && documentAsMap.size() >= 1) {
 			return documentAsMap.entrySet().iterator().next();
 		}
 
diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/SectionView.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/SectionView.java
index 6eceb17..4f40edd 100644
--- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/SectionView.java
+++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/SectionView.java
@@ -44,6 +44,10 @@ public class SectionView implements Serializable, CheckEmpty {
 	}
 
 	public List<SubDocumentView> getListSubDocuments() {
+		
+		if(listSubDocuments == null)
+			listSubDocuments = new ArrayList<SubDocumentView>();
+		
 		return listSubDocuments;
 	}