diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl
index b9a333072ba..562f3bd07e0 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl
@@ -78,8 +78,8 @@
     <xsl:if test="count(../preceding-sibling::mri:resourceConstraints/*[mco:useConstraints]) = 0">
       <xsl:variable name="useConstraints"
                     as="node()*">
-        <xsl:copy-of select="../../mri:resourceConstraints/*[mco:useConstraints]/mco:otherConstraints"/>
-        <xsl:copy-of select="../../mri:resourceConstraints/*[mco:useConstraints]/mco:useLimitation"/>
+        <xsl:copy-of select="ancestor::mri:resourceConstraints/*[mco:useConstraints]/mco:otherConstraints"/>
+        <xsl:copy-of select="ancestor::mri:resourceConstraints/*[mco:useConstraints]/mco:useLimitation"/>
       </xsl:variable>
       <xsl:for-each select="$useConstraints">
         <xsl:choose>
@@ -87,6 +87,7 @@
             <dct:license>
               <dct:LicenseDocument>
                 <xsl:choose>
+                  <!-- TODO: isMappingResourceConstraintsToEuVocabulary -->
                   <xsl:when test="gcx:Anchor/@xlink:href">
                     <xsl:attribute name="rdf:about" select="gcx:Anchor/@xlink:href"/>
                   </xsl:when>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl
index 683de33ea07..ed5ff7829c1 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl
@@ -17,10 +17,27 @@
   <xsl:import href="../dcat/dcat-core.xsl"/>
   <xsl:import href="eu-dcat-ap-core-dataset.xsl"/>
 
+  <!--
+   If true, all resource constraints are preserved in the output.
+   The first one is a license, others are dct:rights.
+   See iso19115-3-to-dcat-license in dcat-core-access-and-use.xsl
+   -->
   <xsl:variable name="isPreservingAllResourceConstraints"
                 as="xs:boolean"
                 select="false()"/>
 
+  <!--
+  If true, the mapping of resource constraints to the EU DCAT-AP vocabulary is enabled.
+  eg. http://creativecommons.org/licenses/by/4.0/ is replaced by http://publications.europa.eu/resource/authority/licence/CC_BY_4.0
+  -->
+  <xsl:variable name="isMappingResourceConstraintsToEuVocabulary"
+                as="xs:boolean"
+                select="true()"/>
+
+  <!--
+  If true, the ISO resource scope is preserved in the output.
+  See iso19115-3-to-dcat-metadataScope in dcat-core.xsl
+  -->
   <xsl:variable name="isPreservingIsoType"
                 as="xs:boolean"
                 select="false()"/>
@@ -116,18 +133,6 @@
    * keep only first.
    * Use dct:license for the first useLimitation and then dct:rights?
   -->
-  <xsl:template mode="iso19115-3-to-dcat"
-                match="mdb:identificationInfo/*/mri:resourceConstraints/*[mco:useConstraints]/mco:otherConstraints
-                      |mdb:identificationInfo/*/mri:resourceConstraints/*[mco:useConstraints]/mco:useLimitation"
-                priority="2">
-    <xsl:variable name="allLicenseStatements"
-                  select="ancestor::mri:resourceConstraints/*[mco:useConstraints]/(mco:otherConstraints|mco:useLimitation)"/>
-
-    <!-- Keep first constraints statement / Ignore others -->
-    <xsl:if test="current()/generate-id() = $allLicenseStatements[1]/generate-id()">
-      <xsl:call-template name="iso19115-3-to-dcat-license"/>
-    </xsl:if>
-  </xsl:template>
 
 
   <!-- [o]	provenance	Provenance Statement	0..*	A statement about the lineage of a Dataset.