diff --git a/src/main/plugin/iso19139.ca.HNAP/layout/layout-custom-fields.xsl b/src/main/plugin/iso19139.ca.HNAP/layout/layout-custom-fields.xsl
index ffd6be13..5fe09c8e 100644
--- a/src/main/plugin/iso19139.ca.HNAP/layout/layout-custom-fields.xsl
+++ b/src/main/plugin/iso19139.ca.HNAP/layout/layout-custom-fields.xsl
@@ -751,7 +751,8 @@
              data-label=""
              data-element-name="{name(gco:Date|gco:DateTime)}"
              data-element-ref="{concat('_X', gn:element/@ref)}"
-             data-hide-time="{if ($viewConfig/@hideTimeInCalendar = 'true') then 'true' else 'false'}">
+             data-hide-date-mode="true"
+             data-hide-time="{not(gco:DateTime)}">
         </div>
 
 
diff --git a/src/main/plugin/iso19139.ca.HNAP/loc/eng/schematron-rules-common.xml b/src/main/plugin/iso19139.ca.HNAP/loc/eng/schematron-rules-common.xml
index 1045bf64..b712cd74 100644
--- a/src/main/plugin/iso19139.ca.HNAP/loc/eng/schematron-rules-common.xml
+++ b/src/main/plugin/iso19139.ca.HNAP/loc/eng/schematron-rules-common.xml
@@ -18,6 +18,7 @@
   <PublicationDate>Value is required for Metadata publication date</PublicationDate>
   <CreationDate>Value is required for Metadata creation date</CreationDate>
   <MissingDate>Value is required for Date</MissingDate>
+  <InvalidDate>Date format is not valid. Should be: YYYY-MM-DD</InvalidDate>
   <InvalidDateTypeCode>Date type is not valid</InvalidDateTypeCode>
   <BeginDate>Value is required for Begin Date</BeginDate>
   <BeginPositionFormat>Begin position format is not valid value</BeginPositionFormat>
diff --git a/src/main/plugin/iso19139.ca.HNAP/loc/fre/schematron-rules-common.xml b/src/main/plugin/iso19139.ca.HNAP/loc/fre/schematron-rules-common.xml
index fa407fd0..13e14d04 100644
--- a/src/main/plugin/iso19139.ca.HNAP/loc/fre/schematron-rules-common.xml
+++ b/src/main/plugin/iso19139.ca.HNAP/loc/fre/schematron-rules-common.xml
@@ -18,6 +18,7 @@
   <PublicationDate>Une valeur est nécessaire pour: Métadonnées date de publication</PublicationDate>
   <CreationDate>>Une valeur est nécessaire pour: Métadonnées date de création</CreationDate>
   <MissingDate>Une valeur est nécessaire pour la Date</MissingDate>
+  <InvalidDate>Le format de date n'est pas valide. Devrait être: YYYY-MM-DD</InvalidDate>
   <InvalidDateTypeCode>Le code de type de date n'est pas valide</InvalidDateTypeCode>
   <BeginDate>Une valeur est nécessaire pour la Date de début</BeginDate>
   <BeginPositionFormat>Le format de la date de début n’est pas valide</BeginPositionFormat>
diff --git a/src/main/plugin/iso19139.ca.HNAP/process/fix-date-format.xsl b/src/main/plugin/iso19139.ca.HNAP/process/fix-date-format.xsl
new file mode 100644
index 00000000..bba9eb49
--- /dev/null
+++ b/src/main/plugin/iso19139.ca.HNAP/process/fix-date-format.xsl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
+                  xmlns:gco="http://www.isotc211.org/2005/gco"
+                  xmlns:gmd="http://www.isotc211.org/2005/gmd"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xmlns:geonet="http://www.fao.org/geonetwork"
+                  exclude-result-prefixes="#all">
+
+  <xsl:template match="gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date[gco:Date and string-length(gco:Date) != 10]/gco:Date">
+
+    <xsl:variable name="value" select="." />
+
+    <xsl:copy>
+      <xsl:choose>
+        <xsl:when test="matches($value, '^\d{4}$')">
+          <xsl:value-of select="concat($value, '-01-01')"/>
+        </xsl:when>
+        <xsl:when test="matches($value, '^\d{4}-(0[1-9]|1[0-2])$')">
+          <xsl:value-of select="concat($value, '-01')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$value"/>
+        </xsl:otherwise>
+      </xsl:choose>
+
+    </xsl:copy>
+
+  </xsl:template>
+
+
+  <!-- Do a copy of every nodes and attributes -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- Remove geonet:* elements. -->
+  <xsl:template match="geonet:*" priority="2"/>
+</xsl:stylesheet>
diff --git a/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-common.sch b/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-common.sch
index 20f72dca..9ee2d543 100644
--- a/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-common.sch
+++ b/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-common.sch
@@ -239,6 +239,14 @@
       <sch:assert
         test="not($missing)"
       >$loc/strings/MissingDate</sch:assert>
+
+      <sch:assert
+        test="not($missing)"
+      >$loc/strings/MissingDate</sch:assert>
+
+      <sch:assert
+        test="($missing) or matches(., '^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$')"
+      >$loc/strings/InvalidDate</sch:assert>
     </sch:rule>
 
 
@@ -440,7 +448,7 @@
     		<sch:let name="protocolListString" value="geonet:protocolListString($protocolList)"/>
 
         <sch:let name="locMsg" value="geonet:appendLocaleMessage($loc/strings/OnlineResourceProtocol, $protocolListString)"/>
-     
+
         <sch:assert test="$isValidProtocol">$locMsg</sch:assert>
 
     </sch:rule>