diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw-brief.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw-brief.xsl
deleted file mode 100644
index f64db528f16..00000000000
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw-brief.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:csw="http://www.opengis.net/cat/csw/2.0.2"
-  xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
-  xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-  xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
-  xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0"
-  xmlns:srv2="http://standards.iso.org/iso/19115/-3/srv/2.0"
-  xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
-  xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
-  xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-  xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0"
-  xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0"
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-  xmlns:gmd="http://www.isotc211.org/2005/gmd"
-  xmlns:srv="http://www.isotc211.org/2005/srv"
-  xmlns:ows="http://www.opengis.net/ows"
-  xmlns:gn="http://www.fao.org/geonetwork"
-  exclude-result-prefixes="#all">
-
-  <xsl:import href="gmd-brief.xsl"/>
-</xsl:stylesheet>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw-summary.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw-summary.xsl
deleted file mode 100644
index 89d10c2b597..00000000000
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw-summary.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:csw="http://www.opengis.net/cat/csw/2.0.2"
-  xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
-  xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-  xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
-  xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0"
-  xmlns:srv2="http://standards.iso.org/iso/19115/-3/srv/2.0"
-  xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
-  xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
-  xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-  xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0"
-  xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0"
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-  xmlns:gmd="http://www.isotc211.org/2005/gmd"
-  xmlns:srv="http://www.isotc211.org/2005/srv"
-  xmlns:ows="http://www.opengis.net/ows"
-  xmlns:gn="http://www.fao.org/geonetwork"
-  exclude-result-prefixes="#all">
-
-  <xsl:import href="gmd-summary.xsl"/>
-</xsl:stylesheet>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw-full.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw.xsl
similarity index 99%
rename from schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw-full.xsl
rename to schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw.xsl
index a758cd80d88..c614a618545 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw-full.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/mw.xsl
@@ -10,11 +10,10 @@
   xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
   xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-  xmlns:srv115-3="http://standards.iso.org/iso/19115/-3/srv/2.1"
   xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
   xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-  xmlns:srv2="http://standards.iso.org/iso/19115/-3/srv/2.1"
+  xmlns:srv2="http://standards.iso.org/iso/19115/-3/srv/2.0"
   xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:util="java:org.fao.geonet.util.XslUtil"
@@ -37,7 +36,7 @@
                 select="count(//mco:otherConstraints/*[@xlink:href]) > 0"/>
 
   <xsl:variable name="isService"
-                select="count(//srv115-3:SV_ServiceIdentification) > 0"/>
+                select="count(//srv2:SV_ServiceIdentification) > 0"/>
 
   <xsl:variable name="isInspireRecord"
                 select="count(//mri:keyword[gco:CharacterString = 'Reporting INSPIRE']) > 0"/>
@@ -218,6 +217,7 @@
                   select="document($apiUrlRelated)"/>
     <xsl:variable name="existingAssociations"
                   select="../mri:associatedResource/*/mri:metadataReference/@uuidref"/>
+
     <xsl:for-each-group select="$associatedRecords/related/*/item" group-by="id">
       <xsl:variable name="uuid" select="current-grouping-key()"/>
       <xsl:if test="count($existingAssociations[. = $uuid]) = 0">