diff --git a/source/content/glossar/bibliothek/geocat-mapping.rst b/source/content/glossar/bibliothek/geocat-mapping.rst
index fa662786..ddeca343 100644
--- a/source/content/glossar/bibliothek/geocat-mapping.rst
+++ b/source/content/glossar/bibliothek/geocat-mapping.rst
@@ -429,35 +429,35 @@ Dataset
     .. include:: geocat-mappings/dataset-qualified-relation.rst
 
 .. toggle-header::
-    :header: Definition of ``dcat:qualifiedRelation`` in DCAT-AP CH
+    :header: Example for geocat mapping to ``dcat:qualifiedRelation``
 
     .. include:: geocat-examples/dataset-qualified-relation.rst
 
 .. _geocat-dataset-documentation:
 
 ``//gmd:distributionInfo/gmd:MD_Distribution`` to ``foaf:page``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. container:: Mapping
 
     .. include:: geocat-mappings/dataset-documentation.rst
 
 .. toggle-header::
-    :header: Definition of ``foaf:page`` in DCAT-AP CH
+    :header: Example for geocat mapping to ``foaf:page``
 
     .. include:: geocat-examples/dataset-documentation.rst
 
 .. _geocat-dataset-conforms-to:
 
 ``//che:dataModel//che:LocalisedURL`` to ``dct:conformsTo``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. container:: Mapping
 
     .. include:: geocat-mappings/dataset-conforms-to.rst
 
 .. toggle-header::
-    :header: Definition of ``dct:conformsTo`` in DCAT-AP CH
+    :header: Example for geocat mapping to  ``dct:conformsTo``
 
     .. include:: geocat-examples/dataset-conforms-to.rst
 
diff --git a/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst b/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst
index cc3e3444..cdab5aff 100644
--- a/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst
+++ b/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst
@@ -1,10 +1,15 @@
 :DCAT: :ref:`dct:conformsTo <dcat-dataset-conforms-to>`
 :XPATH: ``che:CHEMD_Metadata/gmd:contentInfo/che:CHE_MD_FeatureCatalogueDescription/che:dataModel/``
-:Value: ``.//che:PTFreeURL/che:URLGroup/che:LocalisedURL <string-length(text()) > 0><0>``
+:Value: ``.//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel/text()``
 :Usage Notes: 
 
 .. code-block:: xml
-    :caption: ISO-19139_che XPath for geocat distribution
+    :caption: ISO-19139_che XPath for dct:conforms to
 
-    che:CHEMD_Metadata/gmd:contentInfo/che:CHE_MD_FeatureCatalogueDescription/che:dataModel/che:PTFreeURL/che:URLGroup/che:LocalisedURL <string-length(text()) > 0><0>
+   
+    .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURL[@locale="#DE"]/text()
+    .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURLL[@locale="#FR"]/text()
+    .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURL[@locale="#EN"]/text()
+    .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURL[@locale="#IT"]/text()
+    .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURL/text()
 
diff --git a/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst b/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst
index c256607a..4dd20ed5 100644
--- a/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst
+++ b/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst
@@ -1,12 +1,12 @@
 :DCAT: :ref:`foaf:page <dcat-dataset-documentation>`
 :XPATH: ``//gmd:distributionInfo/gmd:MD_Distribution//gmd:transferOptions//gmd:CI_OnlineResource``
-:Protocol: ``WWW:LINK``, ``WWW:LINK-1.0-http--link``
+:Protocol: ``WWW:LINK``
 :Value: ``.//gmd:linkage/gmd:URL/text()``
 :Fallback-Value: ``'.//che:LocalisedURL`` for any language
-:Usage Notes: The protocol ``WWW:LINK-1.0-http--link`` is deprecated, please use ``WWW:LINK`` instead
+:Usage Notes: The first resource with WWW:LINK protocol is mapped as dcat:landingPage. All other resources with WWW:LINK protocol are mapped as foaf:page.
 
 .. code-block:: xml
-    :caption: ISO-19139_che XPath for geocat distribution
+    :caption: ISO-19139_che XPath for foaf:page
 
     //gmd:distributionInfo/gmd:MD_Distribution//gmd:transferOptions//gmd:CI_OnlineResource