diff --git a/pom.xml b/pom.xml
index 1f4381d..a8c2a27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,7 @@
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
 			<version>2.3.0</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- LOGGER -->
diff --git a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java
index ae8014a..122b4d2 100644
--- a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java
+++ b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java
@@ -724,23 +724,21 @@ public class ConvertToDataValueObjectModel {
 		if (instantString == null)
 			return null;
 
-		String time = instantString;
+		String time = instantString.trim();
 		DateTimeFormatter formatter = null;
 		try {
-			formatter = DateTimeFormatter.ofPattern(DATE_FORMAT + " " + TIME_FORMAT);
-		} catch (Exception e) {
-			LOG.warn("Parsing error: ", e);
-		}
-
-		try {
-			if (formatter != null) {
+			
+			if(time.contains("T")) {
+				formatter = DateTimeFormatter.ofPattern(DATE_FORMAT + " " + TIME_FORMAT);
 				LocalDateTime instant = LocalDateTime.parse(time);
-
+				return formatter.format(instant);
+			}else {
+				formatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
+				LocalDate instant = LocalDate.parse(time, formatter);
 				return formatter.format(instant);
 			}
 		} catch (Exception e) {
 			LOG.warn("Date format error: ", e);
-			e.printStackTrace();
 		}
 
 		return instantString;