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..ce9bd52d 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
@@ -290,8 +290,8 @@
       <entries>
         <xsl:for-each select="$resourceFormatsTh/rdf:RDF/rdf:Description">
           <entry>
-            <code><xsl:value-of select="ns2:prefLabel[@xml:lang='en']" /></code>
-            <label> <xsl:value-of select="ns2:prefLabel[@xml:lang='en']" /></label>
+            <code><xsl:value-of select="replace(@rdf:about, 'http://geonetwork-opensource.org/EC/resourceformat#', '')" /></code>
+            <label><xsl:value-of select="ns2:prefLabel[@xml:lang=XslUtilHnap:twoCharLangCode($lang)]"/></label>
           </entry>
         </xsl:for-each>
       </entries>
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 3bc7d5be..bca22e91 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
@@ -486,7 +486,7 @@
 
       <sch:let name="distributionFormat" value="gco:CharacterString" />
 
-      <sch:assert test="($missing) or (string($distribution-formats//rdf:Description[normalize-space(ns2:prefLabel[@xml:lang=$mainLanguage2char]) = $distributionFormat]))">$loc/strings/DistributionFormatInvalid</sch:assert>
+      <sch:assert test="($missing) or (string($distribution-formats//rdf:Description[replace(@rdf:about, 'http://geonetwork-opensource.org/EC/resourceformat#', '') = $distributionFormat]))">$loc/strings/DistributionFormatInvalid</sch:assert>
 
     </sch:rule>