diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-relations.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-relations.xsl
index dd87f5281bf..1aaa8d06b8d 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/extract-relations.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/extract-relations.xsl
@@ -34,7 +34,7 @@
                 xmlns:gmx="http://www.isotc211.org/2005/gmx"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:util="java:org.fao.geonet.util.XslUtil"
-                xmlns:uuid="java:java.util.UUID"
+                xmlns:exslt="http://exslt.org/common"
                 xmlns:gn-fn-rel="http://geonetwork-opensource.org/xsl/functions/relations"
                 version="2.0"
                 exclude-result-prefixes="#all">
@@ -86,7 +86,7 @@
   </xsl:template>
 
   <!-- Relation contained in the metadata record has to be returned
-  It could be document or thumbnails
+  It could be a document or thumbnails
   -->
   <xsl:template mode="relation"
                 match="metadata[gmd:MD_Metadata or *[contains(@gco:isoType, 'MD_Metadata')]]"
@@ -100,18 +100,24 @@
 
     <xsl:if test="count(*/descendant::*[name(.) = 'gmd:graphicOverview']/*) > 0">
       <thumbnails>
-        <xsl:for-each select="*/descendant::*[name(.) = 'gmd:graphicOverview']/*">
+        <xsl:for-each select="*/descendant::*[name(.) = 'gmd:graphicOverview']">
           <item>
             <id>
-              <xsl:value-of select="gmd:fileName/gco:CharacterString"/>
+              <xsl:value-of select="gmd:MD_BrowseGraphic/gmd:fileName/gco:CharacterString"/>
             </id>
+            <idx>
+              <xsl:value-of select="position()"/>
+            </idx>
+            <hash>
+              <xsl:value-of select="util:md5Hex(exslt:node-set(.))"/>
+            </hash>
             <url>
               <xsl:apply-templates mode="get-iso19139-localized-string"
-                                   select="gmd:fileName"/>
+                                   select="gmd:MD_BrowseGraphic/gmd:fileName"/>
             </url>
             <title>
               <xsl:apply-templates mode="get-iso19139-localized-string"
-                                   select="gmd:fileDescription"/>
+                                   select="gmd:MD_BrowseGraphic/gmd:fileDescription"/>
             </title>
             <type>thumbnail</type>
           </item>
@@ -121,47 +127,54 @@
 
     <xsl:if test="count(*/descendant::*[name(.) = 'gmd:onLine']/*[gmd:linkage/gmd:URL!='']) > 0">
       <onlines>
-        <xsl:for-each select="*/descendant::*[name(.) = 'gmd:onLine']/*[gmd:linkage/gmd:URL!='']">
-          <item>
-            <xsl:variable name="langCode">
-              <xsl:value-of select="concat('#', upper-case(util:twoCharLangCode($lang, 'EN')))"/>
-            </xsl:variable>
-            <xsl:variable name="url" select="gmd:linkage/gmd:URL"/>
-            <xsl:variable name="uid" select="uuid:randomUUID()"/>
-            <id>
-              <xsl:value-of select="$uid"/>
-            </id>
-            <title>
-              <xsl:apply-templates mode="get-iso19139-localized-string"
-                                   select="gmd:name"/>
-            </title>
-            <url>
-              <value lang="{$mainLanguage}">
+        <xsl:for-each select="*/descendant::*[name(.) = 'gmd:onLine']">
+          <xsl:if test="gmd:CI_OnlineResource[gmd:linkage/gmd:URL!='']">
+            <item>
+              <xsl:variable name="langCode">
+                <xsl:value-of select="concat('#', upper-case(util:twoCharLangCode($lang, 'EN')))"/>
+              </xsl:variable>
+              <xsl:variable name="url" select="gmd:CI_OnlineResource/gmd:linkage/gmd:URL"/>
+              <id>
                 <xsl:value-of select="$url"/>
-              </value>
-            </url>
-            <function>
-              <xsl:value-of select="gmd:function/*/@codeListValue"/>
-            </function>
-            <applicationProfile>
-              <xsl:value-of select="gmd:applicationProfile/*/text()"/>
-            </applicationProfile>
-            <description>
-              <xsl:apply-templates mode="get-iso19139-localized-string"
-                                   select="gmd:description"/>
-            </description>
-            <protocol>
-              <xsl:value-of select="gn-fn-rel:translate(gmd:protocol, $langCode)"/>
-            </protocol>
-            <mimeType>
-              <xsl:value-of select="if (*/gmx:MimeFileType)
-                                then */gmx:MimeFileType/@type
-                                else if (starts-with(gmd:protocol/gco:CharacterString, 'WWW:DOWNLOAD:'))
-                                then replace(gmd:protocol/gco:CharacterString, 'WWW:DOWNLOAD:', '')
-                                else ''"/>
-            </mimeType>
-            <type>onlinesrc</type>
-          </item>
+              </id>
+              <idx>
+                <xsl:value-of select="position()"/>
+              </idx>
+              <hash>
+                <xsl:value-of select="util:md5Hex(exslt:node-set(.))"/>
+              </hash>
+              <title>
+                <xsl:apply-templates mode="get-iso19139-localized-string"
+                                     select="gmd:CI_OnlineResource/gmd:name"/>
+              </title>
+              <url>
+                <value lang="{$mainLanguage}">
+                  <xsl:value-of select="$url"/>
+                </value>
+              </url>
+              <function>
+                <xsl:value-of select="gmd:CI_OnlineResource/gmd:function/*/@codeListValue"/>
+              </function>
+              <applicationProfile>
+                <xsl:value-of select="gmd:CI_OnlineResource/gmd:applicationProfile/*/text()"/>
+              </applicationProfile>
+              <description>
+                <xsl:apply-templates mode="get-iso19139-localized-string"
+                                     select="gmd:CI_OnlineResource/gmd:description"/>
+              </description>
+              <protocol>
+                <xsl:value-of select="gn-fn-rel:translate(gmd:CI_OnlineResource/gmd:protocol, $langCode)"/>
+              </protocol>
+              <mimeType>
+                <xsl:value-of select="if (gmd:CI_OnlineResource/*/gmx:MimeFileType)
+                                  then gmd:CI_OnlineResource/*/gmx:MimeFileType/@type
+                                  else if (starts-with(gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString, 'WWW:DOWNLOAD:'))
+                                  then replace(gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString, 'WWW:DOWNLOAD:', '')
+                                  else ''"/>
+              </mimeType>
+              <type>onlinesrc</type>
+            </item>
+          </xsl:if>
         </xsl:for-each>
       </onlines>
     </xsl:if>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-add.xsl b/schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-add.xsl
index 6947108375b..09deafe2af6 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-add.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-add.xsl
@@ -30,6 +30,9 @@ Insert is made in first transferOptions found.
                 xmlns:gco="http://www.isotc211.org/2005/gco"
                 xmlns:gmx="http://www.isotc211.org/2005/gmx"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:util="java:org.fao.geonet.util.XslUtil"
+                xmlns:exslt="http://exslt.org/common"
                 version="2.0">
 
   <!-- Main properties for the link.
@@ -52,98 +55,120 @@ Insert is made in first transferOptions found.
   in this one. -->
   <xsl:param name="extra_metadata_uuid"/>
 
-  <!-- Target element to update. The key is based on the concatenation
-  of URL+Protocol+Name -->
+  <!-- Target element to update.
+      updateKey is used to identify the resource name to be updated - it is for backwards compatibility.  Will not be used if resourceHash is set.
+                The key is based on the concatenation of URL+Protocol+Name
+      resourceHash is hash value of the object to be removed which will ensure the correct value is removed. It will override the usage of updateKey
+      resourceIdx is the index location of the object to be removed - can be used when duplicate entries exists to ensure the correct one is removed.
+  -->
+
   <xsl:param name="updateKey"/>
+  <xsl:param name="resourceHash"/>
+  <xsl:param name="resourceIdx"/>
 
+  <xsl:variable name="update_flag">
+    <xsl:value-of select="boolean($updateKey != '' or $resourceHash != '' or $resourceIdx != '')"/>
+  </xsl:variable>
 
   <xsl:variable name="mainLang">
     <xsl:value-of
       select="(gmd:MD_Metadata|*[@gco:isoType='gmd:MD_Metadata'])/gmd:language/gmd:LanguageCode/@codeListValue"/>
   </xsl:variable>
 
-  <xsl:template match="gmd:MD_Metadata|*[@gco:isoType='gmd:MD_Metadata']">
+  <!-- Add new gmd:onLine and consider cases where parent elements don't exist -->
+  <!--  <gmd:distributionInfo> does not exist-->
+  <xsl:template match="gmd:MD_Metadata[$update_flag = false()]|*[@gco:isoType='gmd:MD_Metadata' and $update_flag = false()]">
     <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates
-        select="gmd:fileIdentifier|
-                gmd:language|
-                gmd:characterSet|
-                gmd:parentIdentifier|
-                gmd:hierarchyLevel|
-                gmd:hierarchyLevelName|
-                gmd:contact|
-                gmd:dateStamp|
-                gmd:metadataStandardName|
-                gmd:metadataStandardVersion|
-                gmd:dataSetURI|
-                gmd:locale|
-                gmd:spatialRepresentationInfo|
-                gmd:referenceSystemInfo|
-                gmd:metadataExtensionInfo|
-                gmd:identificationInfo|
-                gmd:contentInfo"/>
-
-      <gmd:distributionInfo>
-        <gmd:MD_Distribution>
-          <xsl:apply-templates
-            select="gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat"/>
-          <xsl:apply-templates
-            select="gmd:distributionInfo/gmd:MD_Distribution/gmd:distributor"/>
-          <gmd:transferOptions>
-            <gmd:MD_DigitalTransferOptions>
-              <xsl:apply-templates
-                select="gmd:distributionInfo/gmd:MD_Distribution/
-                          gmd:transferOptions[1]/gmd:MD_DigitalTransferOptions/gmd:unitsOfDistribution"/>
-              <xsl:apply-templates
-                select="gmd:distributionInfo/gmd:MD_Distribution/
-                          gmd:transferOptions[1]/gmd:MD_DigitalTransferOptions/gmd:transferSize"/>
-              <xsl:apply-templates
-                select="gmd:distributionInfo/gmd:MD_Distribution/
-                          gmd:transferOptions[1]/gmd:MD_DigitalTransferOptions/gmd:onLine"/>
-
-
-              <xsl:if test="$updateKey = ''">
+      <xsl:apply-templates select="node()|@*"/>
+      <xsl:if test="not(gmd:distributionInfo)">
+        <gmd:distributionInfo>
+          <gmd:MD_Distribution>
+            <gmd:transferOptions>
+              <gmd:MD_DigitalTransferOptions>
                 <xsl:call-template name="createOnlineSrc"/>
-              </xsl:if>
+              </gmd:MD_DigitalTransferOptions>
+            </gmd:transferOptions>
+          </gmd:MD_Distribution>
+        </gmd:distributionInfo>
+      </xsl:if>
+    </xsl:copy>
+  </xsl:template>
 
-              <xsl:apply-templates
-                select="gmd:distributionInfo/gmd:MD_Distribution/
-                          gmd:transferOptions[1]/gmd:MD_DigitalTransferOptions/gmd:offLine"/>
+  <!--  <gmd:MD_Distribution> does not exist-->
+  <xsl:template match="*/gmd:distributionInfo[$update_flag = false()]">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+          <xsl:if test="not(gmd:MD_Distribution)">
+            <gmd:MD_Distribution>
+              <gmd:transferOptions>
+                <gmd:MD_DigitalTransferOptions>
+                  <xsl:call-template name="createOnlineSrc"/>
+                </gmd:MD_DigitalTransferOptions>
+              </gmd:transferOptions>
+            </gmd:MD_Distribution>
+          </xsl:if>
+    </xsl:copy>
+  </xsl:template>
+
+  <!--  <gmd:transferOptions> does not exist-->
+  <xsl:template match="*/gmd:distributionInfo/gmd:MD_Distribution[$update_flag = false()]">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+        <xsl:if test="not(gmd:transferOptions)">
+          <gmd:transferOptions>
+            <gmd:MD_DigitalTransferOptions>
+              <xsl:call-template name="createOnlineSrc"/>
             </gmd:MD_DigitalTransferOptions>
           </gmd:transferOptions>
+        </xsl:if>
+    </xsl:copy>
+  </xsl:template>
 
+  <!--  <gmd:MD_DigitalTransferOptions> does not exist-->
+  <xsl:template match="*/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions[$update_flag = false()][1]">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+      <xsl:if test="not(gmd:MD_DigitalTransferOptions)">
+        <gmd:MD_DigitalTransferOptions>
+          <xsl:call-template name="createOnlineSrc"/>
+        </gmd:MD_DigitalTransferOptions>
+      </xsl:if>
+    </xsl:copy>
+  </xsl:template>
 
-          <xsl:apply-templates
-            select="gmd:distributionInfo/gmd:MD_Distribution/
-                      gmd:transferOptions[position() > 1]"/>
-
-        </gmd:MD_Distribution>
-      </gmd:distributionInfo>
-
-      <xsl:apply-templates
-        select="gmd:dataQualityInfo|
-                gmd:portrayalCatalogueInfo|
-                gmd:metadataConstraints|
-                gmd:applicationSchemaInfo|
-                gmd:metadataMaintenance|
-                gmd:series|
-                gmd:describes|
-                gmd:propertyType|
-                gmd:featureType|
-                gmd:featureAttribute"/>
+  <!--  Add new gmd:gmd:onLine-->
+  <xsl:template match="*/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions[1]/gmd:MD_DigitalTransferOptions[$update_flag = false()]">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+      <xsl:call-template name="createOnlineSrc"/>
     </xsl:copy>
   </xsl:template>
 
+  <!-- End of inserting gmd:onLine -->
+
 
-  <!-- Updating the link matching the update key. -->
-  <xsl:template match="gmd:onLine[$updateKey != '' and
-                        normalize-space($updateKey) = concat(
+  <!-- Updating the gmd:onLine based on update parameters -->
+  <xsl:template
+    priority="2"
+    match="*[$update_flag = true() and gmd:onLine]">
+    <xsl:for-each select="gmd:onLine">
+      <xsl:choose>
+        <xsl:when test="($resourceIdx = '' or position() = xs:integer($resourceIdx))
+                   and ($resourceHash != '' or normalize-space($updateKey) = concat(
                         gmd:CI_OnlineResource/gmd:linkage/gmd:URL,
                         gmd:CI_OnlineResource/gmd:protocol/*,
-                        gmd:CI_OnlineResource/gmd:name/gco:CharacterString)
-                        ]">
-    <xsl:call-template name="createOnlineSrc"/>
+                        gmd:CI_OnlineResource/gmd:name/gco:CharacterString))
+                   and ($resourceHash = '' or util:md5Hex(exslt:node-set(.)) = $resourceHash)">
+           <xsl:call-template name="createOnlineSrc"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+
+    <xsl:apply-templates select="* except gmd:onLine" />
+
   </xsl:template>
 
 
@@ -170,7 +195,7 @@ Insert is made in first transferOptions found.
 
     <xsl:if test="$url">
       <!-- In case the protocol is an OGC protocol
-      the name parameter may contains a list of layers
+      the name parameter may contain a list of layers
       separated by comma.
       In that case on one online element is added per
       layer/featureType.
diff --git a/schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-remove.xsl b/schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-remove.xsl
index e945099369a..d0736747f26 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-remove.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-remove.xsl
@@ -28,27 +28,60 @@ Stylesheet used to remove a reference to a online resource.
 <xsl:stylesheet xmlns:geonet="http://www.fao.org/geonetwork" xmlns:gmd="http://www.isotc211.org/2005/gmd"
                 xmlns:gco="http://www.isotc211.org/2005/gco"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:util="java:org.fao.geonet.util.XslUtil"
+                xmlns:exslt="http://exslt.org/common"
                 version="2.0">
 
-  <xsl:param name="resourceIndex"/>
+  <!--
+      Usage:
+        url is used to identify the resource url to be removed - it is for backwards compatibility.  Will not be used if resourceHash is set.
+        name is used to identify the resource name to be removed - it is for backwards compatibility.  Will not be used if resourceHash is set.
+        resourceHash is hash value of the object to be removed which will ensure the correct value is removed. It will override the usage of url/name
+        resourceIdx is the index location of the object to be removed - can be used when duplicate entries exists to ensure the correct one is removed.
+
+      example:
+        onlinesrc-remove?url=http://geonetwork.org/resource.txt&name=test
+    -->
+
+  <xsl:param name="resourceHash"/>
+  <xsl:param name="resourceIdx"/>
   <xsl:param name="url"/>
   <xsl:param name="name"/>
 
-  <!-- Do a copy of every nodes and attributes -->
+  <!-- Remove the gmd:onLine define in url parameter  -->
+  <xsl:template
+    priority="2"
+    match="*[gmd:onLine]">
+    <xsl:for-each select="gmd:onLine">
+      <xsl:choose>
+
+        <xsl:when test="gmd:CI_OnlineResource[gmd:linkage/gmd:URL!='']
+                  and ($resourceIdx = '' or position() = xs:integer($resourceIdx))
+                  and ($resourceHash != '' or (normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and normalize-space(gmd:CI_OnlineResource/gmd:name/gco:CharacterString) = normalize-space($name)
+                                            or normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and count(gmd:CI_OnlineResource/gmd:name/gmd:PT_FreeText/gmd:textGroup[gmd:LocalisedCharacterString = $name]) > 0
+                                            or normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and normalize-space(gmd:CI_OnlineResource/gmd:protocol/*) = 'WWW:DOWNLOAD-1.0-http--download')
+                      )
+                  and ($resourceHash = '' or util:md5Hex(exslt:node-set(.)) = $resourceHash)">
+          <!-- Remove the thumbnail -->
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+
+    <xsl:apply-templates select="* except gmd:onLine" />
+  </xsl:template>
+
+  <!-- Do a copy of every node and attribute -->
   <xsl:template match="@*|node()">
     <xsl:copy>
       <xsl:apply-templates select="@*|node()"/>
     </xsl:copy>
   </xsl:template>
 
-  <!-- Remove geonet:* elements. -->
-  <xsl:template
-    match="geonet:*|gmd:onLine[normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and normalize-space(gmd:CI_OnlineResource/gmd:name/gco:CharacterString) = normalize-space($name)][number($resourceIndex)]"
-    priority="2"/>
-  <xsl:template
-    match="geonet:*|gmd:onLine[normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and count(gmd:CI_OnlineResource/gmd:name/gmd:PT_FreeText/gmd:textGroup[gmd:LocalisedCharacterString = $name]) > 0][number($resourceIndex)]"
-    priority="2"/>
-  <xsl:template
-    match="geonet:*|gmd:onLine[normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and normalize-space(gmd:CI_OnlineResource/gmd:protocol/*) = 'WWW:DOWNLOAD-1.0-http--download'][number($resourceIndex)]"
-    priority="2"/>
+  <!-- Always remove geonet:* elements. -->
+  <xsl:template match="geonet:*" priority="2"/>
+
 </xsl:stylesheet>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-add.xsl b/schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-add.xsl
index 16b975a837c..83553d4543c 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-add.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-add.xsl
@@ -27,6 +27,9 @@
                 xmlns:srv="http://www.isotc211.org/2005/srv"
                 xmlns:gco="http://www.isotc211.org/2005/gco"
                 xmlns:geonet="http://www.fao.org/geonetwork"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:util="java:org.fao.geonet.util.XslUtil"
+                xmlns:exslt="http://exslt.org/common"
                 exclude-result-prefixes="#all"
                 version="2.0">
 
@@ -41,55 +44,51 @@
   <xsl:param name="thumbnail_desc" select="''"/>
   <xsl:param name="thumbnail_type" select="''"/>
 
-  <!-- Target element to update. The key is based on the concatenation
-  of URL+Name -->
+  <!-- Target element to update.
+    updateKey is used to identify the resource name to be updated - it is for backwards compatibility.  Will not be used if resourceHash is set.
+              The key is based on the concatenation of URL+Name
+    resourceHash is hash value of the object to be removed which will ensure the correct value is removed. It will override the usage of updateKey
+    resourceIdx is the index location of the object to be removed - can be used when duplicate entries exists to ensure the correct one is removed.
+-->
   <xsl:param name="updateKey"/>
+  <xsl:param name="resourceHash"/>
+  <xsl:param name="resourceIdx"/>
 
-  <xsl:template match="gmd:identificationInfo/*">
+  <xsl:variable name="update_flag">
+    <xsl:value-of select="boolean($updateKey != '' or $resourceHash != '' or $resourceIdx != '')"/>
+  </xsl:variable>
+
+  <!--  Add new gmd:graphicOverview -->
+  <xsl:template match="gmd:identificationInfo/*[$update_flag = false()]">
     <xsl:copy>
-      <xsl:copy-of select="@*"/>
-      <xsl:apply-templates select="gmd:citation"/>
-      <xsl:apply-templates select="gmd:abstract"/>
-      <xsl:apply-templates select="gmd:purpose"/>
-      <xsl:apply-templates select="gmd:credit"/>
-      <xsl:apply-templates select="gmd:status"/>
-      <xsl:apply-templates select="gmd:pointOfContact"/>
-      <xsl:apply-templates select="gmd:resourceMaintenance"/>
-
-      <xsl:if test="$updateKey = ''">
-        <xsl:call-template name="fill"/>
-      </xsl:if>
-
-      <xsl:apply-templates select="gmd:graphicOverview"/>
-
-      <xsl:apply-templates select="gmd:resourceFormat"/>
-      <xsl:apply-templates select="gmd:descriptiveKeywords"/>
-      <xsl:apply-templates select="gmd:resourceSpecificUsage"/>
-      <xsl:apply-templates select="gmd:resourceConstraints"/>
-      <xsl:apply-templates select="gmd:aggregationInfo"/>
-      <xsl:apply-templates select="gmd:spatialRepresentationType"/>
-      <xsl:apply-templates select="gmd:spatialResolution"/>
-      <xsl:apply-templates select="gmd:language"/>
-      <xsl:apply-templates select="gmd:characterSet"/>
-      <xsl:apply-templates select="gmd:topicCategory"/>
-      <xsl:apply-templates select="gmd:environmentDescription"/>
-      <xsl:apply-templates select="gmd:extent"/>
-      <xsl:apply-templates select="gmd:supplementalInformation"/>
-
-      <xsl:apply-templates select="srv:*"/>
-
-      <xsl:apply-templates select="*[namespace-uri()!='http://www.isotc211.org/2005/gmd' and
-                                     namespace-uri()!='http://www.isotc211.org/2005/srv']"/>
+      <xsl:apply-templates select="node()|@*"/>
+      <xsl:call-template name="fill"/>
     </xsl:copy>
   </xsl:template>
 
-
-  <xsl:template match="gmd:graphicOverview[concat(
+  <!-- Updating the gmd:graphicOverview based on update parameters -->
+  <xsl:template
+    priority="2"
+    match="*[$update_flag = true() and gmd:graphicOverview]">
+    <xsl:for-each select="gmd:graphicOverview">
+      <xsl:choose>
+        <xsl:when test="($resourceIdx = '' or position() = xs:integer($resourceIdx))
+                    and ($resourceHash != '' or normalize-space($updateKey) = concat(
                          */gmd:fileName/gco:CharacterString,
                          */gmd:fileName/gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString[@locale = '#DE'],
                          */gmd:fileDescription/gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString[@locale = '#DE'],
-                         */gmd:fileDescription/gco:CharacterString) = normalize-space($updateKey)]">
-    <xsl:call-template name="fill"/>
+                         */gmd:fileDescription/gco:CharacterString))
+                   and ($resourceHash = '' or util:md5Hex(exslt:node-set(.)) = $resourceHash)">
+          <xsl:call-template name="fill"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+
+    <xsl:apply-templates select="* except gmd:graphicOverview" />
+
   </xsl:template>
 
   <!-- TMP TO REMOVE when gco:characterString is added in multilingual elements
diff --git a/schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-remove.xsl b/schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-remove.xsl
index a856ed23dd1..f5b2f8016f4 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-remove.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-remove.xsl
@@ -25,22 +25,47 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:gmd="http://www.isotc211.org/2005/gmd"
                 xmlns:gco="http://www.isotc211.org/2005/gco"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:geonet="http://www.fao.org/geonetwork" exclude-result-prefixes="#all"
+                xmlns:util="java:org.fao.geonet.util.XslUtil"
+                xmlns:exslt="http://exslt.org/common"
                 version="2.0">
 
   <!--
       Usage:
+        thumbnail_url is the url to be removed - it is for backwards compatibility.  Will not be used if resourceHash is set.
+        resourceHash is hash value of the object to be removed which will ensure the correct value is removed. It will override the usage of thumbnail_url
+        resourceIdx is the index location of the object to be removed - can be used when duplicate entries exists to ensure the correct one is removed.
+
+      example:
         thumbnail-from-url-remove?thumbnail_url=http://geonetwork.org/thumbnails/image.png
     -->
 
+  <xsl:param name="resourceHash"/>
+  <xsl:param name="resourceIdx"/>
   <xsl:param name="thumbnail_url"/>
 
   <!-- Remove the thumbnail define in thumbnail_url parameter -->
   <xsl:template
     priority="2"
-    match="gmd:graphicOverview[normalize-space(gmd:MD_BrowseGraphic/gmd:fileName/gco:CharacterString) = normalize-space($thumbnail_url)]"/>
+    match="*[gmd:graphicOverview]">
+    <xsl:for-each select="gmd:graphicOverview">
+      <xsl:choose>
+        <xsl:when test="($resourceIdx = '' or position() = xs:integer($resourceIdx))
+                    and ($resourceHash != '' or normalize-space(gmd:MD_BrowseGraphic/gmd:fileName/gco:CharacterString) = normalize-space($thumbnail_url))
+                    and ($resourceHash = '' or util:md5Hex(exslt:node-set(.)) = $resourceHash)">
+          <!-- Remove the thumbnail -->
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+
+    <xsl:apply-templates select="* except gmd:graphicOverview" />
+  </xsl:template>
 
-  <!-- Do a copy of every nodes and attributes -->
+  <!-- Do a copy of every node and attribute -->
   <xsl:template match="@*|node()">
     <xsl:copy>
       <xsl:apply-templates select="@*|node()"/>
diff --git a/services/src/main/java/org/fao/geonet/api/records/model/related/RelatedItem.java b/services/src/main/java/org/fao/geonet/api/records/model/related/RelatedItem.java
index c24ebd29d9c..a8b9b4491d2 100644
--- a/services/src/main/java/org/fao/geonet/api/records/model/related/RelatedItem.java
+++ b/services/src/main/java/org/fao/geonet/api/records/model/related/RelatedItem.java
@@ -40,6 +40,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "relatedItem", propOrder = {
     "id",
+    "idx",
+    "hash",
     "url",
     "title",
     "type"
@@ -52,6 +54,8 @@
 public abstract class RelatedItem {
 
     protected String id;
+    protected String idx;
+    protected String hash;
     protected MultilingualValue url;
     protected String type;
 
@@ -76,6 +80,42 @@ public void setId(String value) {
         this.id = value;
     }
 
+    /**
+     * Gets the value of the idx property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getIdx() {
+        return idx;
+    }
+
+    /**
+     * Sets the value of the idx property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setIdx(String value) {
+        this.idx = value;
+    }
+
+    /**
+     * Gets the value of the hasg property.
+     *
+     * @return possible object is {@link String }
+     */
+    public String getHash() {
+        return hash;
+    }
+
+    /**
+     * Sets the value of the hash property.
+     *
+     * @param value allowed object is {@link String }
+     */
+    public void setHash(String value) {
+        this.hash = value;
+    }
+
     /**
      * Gets the value of the url property.
      *
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
index 636ad8006ef..0856013bf6b 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
@@ -964,6 +964,8 @@
                       }
                     }
                     scope.editingKey = [keyUrl, linkToEdit.protocol, keyName].join("");
+                    scope.editingIdx = linkToEdit.idx;
+                    scope.editingHash = linkToEdit.hash;
 
                     scope.OGCProtocol = checkIsOgc(linkToEdit.protocol);
 
@@ -1012,6 +1014,8 @@
                     };
                   } else {
                     scope.editingKey = null;
+                    scope.editingIdx = null;
+                    scope.editingHash = null;
                     scope.params.linkType = typeConfig;
                     scope.params.protocol = null;
                     scope.params.mimeType = "";
@@ -1203,6 +1207,8 @@
 
                 if (scope.isEditing) {
                   processParams.updateKey = scope.editingKey;
+                  processParams.resourceIdx = scope.editingIdx;
+                  processParams.resourceHash = scope.editingHash;
                 }
 
                 // Add list of layers for WMS
@@ -1944,7 +1950,12 @@
                  * @returns {boolean}
                  */
                 scope.canEnableLinkButton = function (selectRecords) {
-                  if (selectRecords.length < 1) return false;
+                  if (
+                    !selectRecords ||
+                    !Array.isArray(selectRecords) ||
+                    selectRecords.length < 1
+                  )
+                    return false;
 
                   // Check if the metadata titles are defined
                   for (var i = 0; i < selectRecords.length; i++) {
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js
index faafd0e186c..9f76534f31f 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js
@@ -682,17 +682,21 @@
               this,
               setParams("thumbnail-remove", {
                 id: gnCurrentEdit.id,
-                thumbnail_url: thumb.id
+                thumbnail_url: thumb.id,
+                resourceIdx: thumb.idx,
+                resourceHash: thumb.hash
               })
             );
           }
-          // It is an uploaded tumbnail
+          // It is an uploaded thumbnail
           else {
             return runService(
               "removeThumbnail",
               {
                 type: thumb.title === "thumbnail" ? "small" : "large",
                 id: gnCurrentEdit.id,
+                resourceIdx: thumb.idx,
+                resourceHash: thumb.hash,
                 version: gnCurrentEdit.version
               },
               this
@@ -712,16 +716,7 @@
          *
          * @param {Object} onlinesrc the online resource to remove
          */
-        removeOnlinesrc: function (onlinesrc, onlines) {
-          //Passing the index of the xml/xpath into the remove process xsl
-          var xslIndex = -1;
-          for (var i = 0; i < onlines.length; i++) {
-            if (onlinesrc.id === onlines[i].id) {
-              xslIndex = i+1;
-              break;
-            }
-          }
-
+        removeOnlinesrc: function (onlinesrc) {
           var url = onlinesrc.lUrl || onlinesrc.url;
           if (
             url.match(".*/api/records/' + gnCurrentEdit.uuid + '/attachments/.*") != null
@@ -733,7 +728,8 @@
             this,
             setParams("onlinesrc-remove", {
               id: gnCurrentEdit.id,
-              resourceIndex: xslIndex,
+              resourceHash: onlinesrc.hash,
+              resourceIdx: onlinesrc.idx,
               url: url,
               name: $filter("gnLocalized")(onlinesrc.title)
             })
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/onlinesrcList.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/onlinesrcList.html
index b326c7a2b1b..bde4ba3f9aa 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/onlinesrcList.html
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/onlinesrcList.html
@@ -219,7 +219,7 @@
                   aria-label="{{'remove' | translate}} {{resource.title | gnLocalized: lang}}"
                   data-ng-if="readonly !== true"
                   data-gn-confirm-click="{{'removeOnlinesrcConfirm' | translate:{url: resource.lUrl} }}"
-                  data-gn-click-and-spin="onlinesrcService.removeOnlinesrc(resource, relations.onlines)"
+                  data-gn-click-and-spin="onlinesrcService.removeOnlinesrc(resource)"
                 >
                   <i class="fa fa-times text-danger"></i>
                 </a>