diff --git a/docs/translations/releases.adoc.pot b/docs/translations/releases.adoc.pot
index 1a598e5e10..a7a6129890 100644
--- a/docs/translations/releases.adoc.pot
+++ b/docs/translations/releases.adoc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-12-18 13:26+0000\n"
+"POT-Creation-Date: 2024-12-18 16:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/pom.xml b/pom.xml
index 1d468f9a85..65be59813f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <gbif-api.version>1.16.18</gbif-api.version>
     <gbif-common.version>0.60</gbif-common.version>
     <gbif-doi.version>2.21</gbif-doi.version>
-    <gbif-metadata-profile.version>2.6</gbif-metadata-profile.version>
+    <gbif-metadata-profile.version>2.7</gbif-metadata-profile.version>
     <gbif-parsers.version>0.67</gbif-parsers.version>
     <gbif-httputils.version>1.4</gbif-httputils.version>
 
@@ -63,11 +63,13 @@
     <excel-streaming-reader.version>4.4.0</excel-streaming-reader.version>
     <freemarker.version>2.3.33</freemarker.version>
     <frictionless.datapackage-java.version>0.6.16.1-gbif</frictionless.datapackage-java.version>
+    <frictionless.tableschema-java.version>0.6.16.2-gbif</frictionless.tableschema-java.version>
     <gson.version>2.11.0</gson.version>
     <guava.version>20.0</guava.version>
     <guice.version>4.2.3</guice.version>
     <httpclient.version>4.5.14</httpclient.version>
     <httpcore.version>4.4.16</httpcore.version>
+    <jackson.version>2.15.1</jackson.version> <!-- Fixed to the version used in tableschema-java -->
     <jackson-dataformat-yaml.version>2.14.0</jackson-dataformat-yaml.version> <!-- Fixed to 2.14.0 for now because of issues with jackson-datatype-jts -->
     <jackson-datatype-jts.version>2.14</jackson-datatype-jts.version>
     <javassist.version>3.12.1.GA</javassist.version>
@@ -532,6 +534,11 @@
       <artifactId>datapackage-java</artifactId>
       <version>${frictionless.datapackage-java.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.frictionlessdata</groupId>
+      <artifactId>tableschema-java</artifactId>
+      <version>${frictionless.tableschema-java.version}</version>
+    </dependency>
 
     <!-- excel parsing -->
     <dependency>
@@ -678,6 +685,11 @@
       <artifactId>gson</artifactId>
       <version>${gson.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
 
     <!-- Annotations -->
     <dependency>
diff --git a/renovate.json b/renovate.json
index fd8730dc24..b7bf89c255 100644
--- a/renovate.json
+++ b/renovate.json
@@ -27,6 +27,10 @@
     {
       "matchPackageNames": ["com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"],
       "automerge": false
+    },
+    {
+      "matchPackageNames": ["com.fasterxml.jackson.core:jackson-databind"],
+      "automerge": false
     }
   ],
   "ignorePaths": ["package/**", "docs/**"],
diff --git a/src/main/java/org/gbif/ipt/action/manage/ResourceFileAction.java b/src/main/java/org/gbif/ipt/action/manage/ResourceFileAction.java
new file mode 100644
index 0000000000..c027595ba6
--- /dev/null
+++ b/src/main/java/org/gbif/ipt/action/manage/ResourceFileAction.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.gbif.ipt.action.manage;
+
+import org.gbif.ipt.config.AppConfig;
+import org.gbif.ipt.config.Constants;
+import org.gbif.ipt.config.DataDir;
+import org.gbif.ipt.service.admin.RegistrationManager;
+import org.gbif.ipt.service.manage.ResourceManager;
+import org.gbif.ipt.struts2.SimpleTextProvider;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.google.inject.Inject;
+import lombok.Getter;
+
+/**
+ * The Action responsible for serving datadir resource files.
+ */
+public class ResourceFileAction extends ManagerBaseAction {
+
+  // logging
+  private static final Logger LOG = LogManager.getLogger(ResourceFileAction.class);
+
+  private static final long serialVersionUID = -3304799051086050164L;
+
+  private final DataDir dataDir;
+  @Getter
+  private InputStream inputStream;
+  @Getter
+  protected File data;
+  @Getter
+  protected String mimeType = "text/plain";
+  @Getter
+  protected String filename;
+
+  @Inject
+  public ResourceFileAction(SimpleTextProvider textProvider, AppConfig cfg, RegistrationManager registrationManager,
+                            DataDir dataDir, ResourceManager resourceManager) {
+    super(textProvider, cfg, registrationManager, resourceManager);
+    this.dataDir = dataDir;
+  }
+
+  /**
+   * Handles metadata file download request.
+   *
+   * @return Struts2 result string
+   */
+  public String metadata() {
+    if (resource == null) {
+      return NOT_FOUND;
+    }
+
+    boolean isDataPackageResource = resource.getDataPackageIdentifier() != null;
+    // construct download filename
+    StringBuilder sb = new StringBuilder();
+
+    // serve file
+    if (isDataPackageResource) {
+      if (Constants.COL_DP.equals(resource.getCoreType())) {
+        data = dataDir.resourceDatapackageMetadataFile(resource.getShortname(), resource.getCoreType());
+        mimeType = "text/yaml";
+        sb.append("metadata-").append(resource.getShortname());
+        sb.append(".yaml");
+      } else {
+        data = dataDir.resourceDatapackageMetadataFile(resource.getShortname(), resource.getCoreType());
+        mimeType = "application/json";
+        sb.append("datapackage-").append(resource.getShortname());
+        sb.append(".json");
+      }
+    } else {
+      data = dataDir.resourceEmlFile(resource.getShortname());
+      mimeType = "text/xml";
+      sb.append("eml-").append(resource.getShortname());
+      sb.append(".xml");
+    }
+
+    filename = sb.toString();
+    return execute();
+  }
+
+  @Override
+  public String execute() {
+    // make sure we have a download filename
+    if (data == null) {
+      return NOT_FOUND;
+    } else if (filename == null) {
+      filename = data.getName();
+    }
+    try {
+      inputStream = new FileInputStream(data);
+      // Set a Last-Modified header, even on 304 Not Modified responses.
+      // Round to the nearest second, as HTTP doesn't support milliseconds.
+      long lastModified = 1000 * ((data.lastModified() + 500) / 1000);
+      response.setDateHeader("Last-Modified", lastModified);
+
+      // see if we have a conditional get with If-Modified-Since header
+      try {
+        long since = req.getDateHeader("If-Modified-Since");
+        if (since >= lastModified) {
+          return NOT_MODIFIED;
+        }
+      } catch (IllegalArgumentException e) {
+        // headers might not be formed correctly, swallow
+        LOG.warn("Conditional get with If-Modified-Since header couldn't be interpreted", e);
+      }
+    } catch (FileNotFoundException e) {
+      LOG.warn("Data dir file not found", e);
+      return NOT_FOUND;
+    }
+    return SUCCESS;
+  }
+
+  @Override
+  public void prepare() {
+    super.prepare();
+  }
+}
diff --git a/src/main/java/org/gbif/ipt/task/GenerateDataPackage.java b/src/main/java/org/gbif/ipt/task/GenerateDataPackage.java
index 40a35ed026..9819361542 100644
--- a/src/main/java/org/gbif/ipt/task/GenerateDataPackage.java
+++ b/src/main/java/org/gbif/ipt/task/GenerateDataPackage.java
@@ -806,6 +806,7 @@ private void addMetadata() throws GeneratorException, InterruptedException {
       }
 
     } catch (Exception e) {
+      addMessage(Level.ERROR, e.getMessage());
       throw new GeneratorException("Problem occurred while adding metadata file to data package folder", e);
     }
     // final reporting
diff --git a/src/main/java/org/gbif/ipt/validation/EmlValidator.java b/src/main/java/org/gbif/ipt/validation/EmlValidator.java
index 866a61f07b..57eb91daf9 100644
--- a/src/main/java/org/gbif/ipt/validation/EmlValidator.java
+++ b/src/main/java/org/gbif/ipt/validation/EmlValidator.java
@@ -235,6 +235,7 @@ public void validate(BaseAction action, Resource resource, @Nullable MetadataSec
 
           String strippedDescription = Optional.ofNullable(eml.getDescription())
               .map(d -> d.replaceAll("<[^>]*>", "")) // get rid of tags
+              .map(d -> d.replace("&nbsp;", " ")) // replace &nbsp; with a space
               .map(String::trim)
               .orElse("");
 
@@ -251,7 +252,12 @@ public void validate(BaseAction action, Resource resource, @Nullable MetadataSec
           } else {
             try {
               Eml stubValidationEml = getStubEml();
-              stubValidationEml.setDescription(eml.getDescription());
+
+              String descriptionWithNbspReplaced = Optional.ofNullable(eml.getDescription())
+                  .map(d -> d.replace("&nbsp;", " ")) // replace &nbsp; with a space
+                  .orElse("");
+
+              stubValidationEml.setDescription(descriptionWithNbspReplaced);
               String emlString = IptEmlWriter.writeEmlAsString(stubValidationEml);
               emlProfileValidator.validate(emlString);
             } catch (InvalidEmlException e) {
@@ -541,7 +547,12 @@ public void validate(BaseAction action, Resource resource, @Nullable MetadataSec
           } else {
             try {
               Eml stubValidationEml = getStubEml();
-              stubValidationEml.setAcknowledgements(eml.getAcknowledgements());
+
+              String acknowledgementsWithNbspReplaced = Optional.ofNullable(eml.getAcknowledgements())
+                  .map(d -> d.replace("&nbsp;", " ")) // replace &nbsp; with a space
+                  .orElse("");
+
+              stubValidationEml.setAcknowledgements(acknowledgementsWithNbspReplaced);
               String emlString = IptEmlWriter.writeEmlAsString(stubValidationEml);
               emlProfileValidator.validate(emlString);
             } catch (InvalidEmlException e) {
@@ -713,7 +724,12 @@ public void validate(BaseAction action, Resource resource, @Nullable MetadataSec
           } else {
             try {
               Eml stubValidationEml = getStubEml();
-              stubValidationEml.setGettingStarted(eml.getPurpose());
+
+              String purposeWithNbspReplaced = Optional.ofNullable(eml.getPurpose())
+                  .map(d -> d.replace("&nbsp;", " ")) // replace &nbsp; with a space
+                  .orElse("");
+
+              stubValidationEml.setGettingStarted(purposeWithNbspReplaced);
               String emlString = IptEmlWriter.writeEmlAsString(stubValidationEml);
               emlProfileValidator.validate(emlString);
             } catch (InvalidEmlException e) {
@@ -725,7 +741,12 @@ public void validate(BaseAction action, Resource resource, @Nullable MetadataSec
 
             try {
               Eml stubValidationEml = getStubEml();
-              stubValidationEml.setGettingStarted(eml.getGettingStarted());
+
+              String gettingStartedWithNbspReplaced = Optional.ofNullable(eml.getGettingStarted())
+                  .map(d -> d.replace("&nbsp;", " ")) // replace &nbsp; with a space
+                  .orElse("");
+
+              stubValidationEml.setGettingStarted(gettingStartedWithNbspReplaced);
               String emlString = IptEmlWriter.writeEmlAsString(stubValidationEml);
               emlProfileValidator.validate(emlString);
             } catch (InvalidEmlException e) {
@@ -737,7 +758,12 @@ public void validate(BaseAction action, Resource resource, @Nullable MetadataSec
 
             try {
               Eml stubValidationEml = getStubEml();
-              stubValidationEml.setIntroduction(eml.getIntroduction());
+
+              String introductionWithNbspReplaced = Optional.ofNullable(eml.getIntroduction())
+                  .map(d -> d.replace("&nbsp;", " ")) // replace &nbsp; with a space
+                  .orElse("");
+
+              stubValidationEml.setIntroduction(introductionWithNbspReplaced);
               String emlString = IptEmlWriter.writeEmlAsString(stubValidationEml);
               emlProfileValidator.validate(emlString);
             } catch (InvalidEmlException e) {
diff --git a/src/main/resources/ApplicationResources_en.properties b/src/main/resources/ApplicationResources_en.properties
index 6ade9cf70e..d43a6daec8 100644
--- a/src/main/resources/ApplicationResources_en.properties
+++ b/src/main/resources/ApplicationResources_en.properties
@@ -552,7 +552,6 @@ portal.resource.other=Other Metadata
 portal.resource.spatial.coordinates=Coordinates
 portal.resource.spatial.coordinatePrecision=Coordinate precision
 portal.resource.taxonomic.taxonId=Taxon id
-portal.resource.taxonomic.taxonIdReference=Taxon id reference
 portal.resource.taxonomic.scientificName=Scientific name
 portal.resource.taxonomic.taxonRank=Taxon rank
 portal.resource.taxonomic.vernacularNames=Vernacular names
diff --git a/src/main/resources/struts-manage.xml b/src/main/resources/struts-manage.xml
index 132fd69ece..7de086cbdf 100644
--- a/src/main/resources/struts-manage.xml
+++ b/src/main/resources/struts-manage.xml
@@ -187,6 +187,16 @@
       <result name="error" type="redirect">${baseURL}/manage/resource.do?r=${resource.shortname}</result>
     </action>
 
+    <action name="eml" class="org.gbif.ipt.action.manage.ResourceFileAction" method="metadata">
+      <result name="success" type="stream">
+        <param name="contentType">${mimeType}</param>
+        <param name="contentCharSet">UTF-8</param>
+        <param name="inputName">inputStream</param>
+        <param name="contentDisposition">filename="${filename}"</param>
+        <param name="bufferSize">1024</param>
+      </result>
+    </action>
+
     <action name="delete-mapping" class="org.gbif.ipt.action.manage.MappingAction" method="delete">
       <result name="success" type="redirect">${baseURL}/manage/resource.do?r=${resource.shortname}</result>
       <result name="error" type="redirect">${baseURL}/manage/resource.do?r=${resource.shortname}</result>
diff --git a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/basic.ftl b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/basic.ftl
index ef0e7c1e98..f2d084b7d4 100644
--- a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/basic.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/basic.ftl
@@ -401,6 +401,8 @@
                 allowClear: true,
                 theme: 'bootstrap4'
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -413,6 +415,8 @@
     </div>
 
     <form class="needs-validation" action="camtrap-metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/citation.ftl b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/citation.ftl
index b930896e49..01e270ed94 100644
--- a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/citation.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/citation.ftl
@@ -38,6 +38,8 @@
                 $("#generateOn").show();
                 $("#generateOff").hide();
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -50,6 +52,8 @@
     </div>
 
     <form class="needs-validation" action="camtrap-metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/geographic.ftl b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/geographic.ftl
index 7bba978aaf..0733c1a758 100644
--- a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/geographic.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/geographic.ftl
@@ -75,6 +75,8 @@
             });
 
             $("#re-infer-link").on('click', displayProcessing);
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -87,6 +89,8 @@
     </div>
 
     <form id="geographic-scope-form" class="needs-validation" action="camtrap-metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/keywords.ftl b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/keywords.ftl
index 8c94e3c9bc..8190656ba8 100644
--- a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/keywords.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/keywords.ftl
@@ -73,6 +73,8 @@
                 // scroll to the element
                 $('body, html').animate({scrollTop: pos});
             }
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -85,6 +87,8 @@
     </div>
 
     <form class="needs-validation" action="camtrap-metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/other.ftl b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/other.ftl
index 4043ce65a2..8e4483d1d3 100644
--- a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/other.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/other.ftl
@@ -217,6 +217,8 @@
                 allowClear: true,
                 theme: 'bootstrap4'
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -229,6 +231,8 @@
     </div>
 
     <form class="needs-validation" action="camtrap-metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/project.ftl b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/project.ftl
index 9cd4758f09..bb163b3579 100644
--- a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/project.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/project.ftl
@@ -43,6 +43,8 @@
                 allowClear: true,
                 theme: 'bootstrap4'
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -56,6 +58,8 @@
     </div>
 
     <form class="needs-validation" action="camtrap-metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/taxonomic.ftl b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/taxonomic.ftl
index 028dfccc56..148d05255b 100644
--- a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/taxonomic.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/taxonomic.ftl
@@ -300,6 +300,8 @@
             });
 
             $("#re-infer-link").on('click', displayProcessing);
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -312,6 +314,8 @@
     </div>
 
     <form id="taxonomic-metadata-form" class="needs-validation" action="camtrap-metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/temporal.ftl b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/temporal.ftl
index db976f3963..262cba68e2 100644
--- a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/temporal.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/camtrap/temporal.ftl
@@ -47,6 +47,8 @@
             });
 
             $("#re-infer-link").on('click', displayProcessing);
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -59,6 +61,8 @@
     </div>
 
     <form class="needs-validation" action="camtrap-metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/frictionless/basic.ftl b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/frictionless/basic.ftl
index 610223bb87..dae7358f66 100644
--- a/src/main/webapp/WEB-INF/pages/manage/dp-metadata/frictionless/basic.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/dp-metadata/frictionless/basic.ftl
@@ -229,6 +229,8 @@
                 // scroll to the element
                 $('body, html').animate({scrollTop: pos});
             }
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/acknowledgements.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/acknowledgements.ftl
index b3ea3ec8e9..7b6f3e31e2 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/acknowledgements.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/acknowledgements.ftl
@@ -52,6 +52,8 @@
                 // Submit the form
                 this.submit();
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -74,6 +76,8 @@
     </div>
 
     <form id="acknowledgements-form" class="needs-validation" action="metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/additional.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/additional.ftl
index 175872bcfb..48dc3165a9 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/additional.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/additional.ftl
@@ -115,6 +115,8 @@
 
                 hideProcessing();
             }
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMetadataPage = "additional"/>
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/additionalDescription.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/additionalDescription.ftl
index a2afa79531..55ce1a824b 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/additionalDescription.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/additionalDescription.ftl
@@ -123,6 +123,8 @@
                 // Submit the form
                 this.submit();
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMenu="manage"/>
@@ -145,6 +147,8 @@
     </div>
 
     <form id="additional-description-form" class="needs-validation" action="metadata-${section}.do" method="post" novalidate>
+        <input type="hidden" name="r" value="${resource.shortname}" />
+
         <div class="container-fluid bg-body border-bottom">
             <div class="container bg-body border rounded-2 mb-4">
                 <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/basic.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/basic.ftl
index f2f26306e8..055974a902 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/basic.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/basic.ftl
@@ -271,6 +271,8 @@
                 // Submit the form
                 this.submit();
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <style>
@@ -322,6 +324,8 @@
 </div>
 
 <form id="basic-metadata-form" class="needs-validation" action="metadata-${section}.do" method="post" novalidate>
+    <input type="hidden" name="r" value="${resource.shortname}" />
+
     <div class="container-fluid bg-body border-bottom">
         <div class="container bg-body border rounded-2 mb-4">
             <div class="container my-3 p-3">
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/citations.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/citations.ftl
index 8766ec4701..bc9e248eea 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/citations.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/citations.ftl
@@ -90,6 +90,8 @@
 
                 hideProcessing();
             }
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#include "/WEB-INF/pages/macros/metadata.ftl"/>
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/collections.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/collections.ftl
index b54995bce9..e959b41599 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/collections.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/collections.ftl
@@ -125,6 +125,8 @@
                 allowClear: false,
                 theme: 'bootstrap4'
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
 
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/contacts.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/contacts.ftl
index 745578e5cb..37112dc962 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/contacts.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/contacts.ftl
@@ -205,6 +205,7 @@
                 }
             });
 
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <style>
@@ -2319,9 +2320,6 @@
                                 </a>
                             </div>
 
-                            <!-- internal parameter -->
-                            <input name="r" type="hidden" value="${resource.shortname}" />
-
                             <div id="baseItem-associatedParty" class="item row g-2 pb-4 border-bottom" style="display:none;">
                                 <div class="handle columnLinks mt-4 d-flex justify-content-between">
                                     <div>
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/geocoverage.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/geocoverage.ftl
index 0b1063662a..c80e2e4f60 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/geocoverage.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/geocoverage.ftl
@@ -427,6 +427,8 @@
             $("#top-save").click(function (event) {
                 validateCoordinates(event);
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
 
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/keywords.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/keywords.ftl
index 7ae3dda3f6..88e3f83488 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/keywords.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/keywords.ftl
@@ -59,6 +59,8 @@
 
                 hideProcessing();
             }
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#include "/WEB-INF/pages/macros/metadata.ftl"/>
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/methods.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/methods.ftl
index b132924986..d02fc5f691 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/methods.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/methods.ftl
@@ -64,6 +64,8 @@
 
                 hideProcessing();
             }
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <#assign currentMetadataPage = "methods"/>
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/physical.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/physical.ftl
index 8d3284a433..68052f7727 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/physical.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/physical.ftl
@@ -62,6 +62,8 @@
 
                 hideProcessing();
             }
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
 
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/project.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/project.ftl
index 6af2128761..fae3fad3db 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/project.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/project.ftl
@@ -131,6 +131,8 @@
                 allowClear: true,
                 theme: 'bootstrap4'
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <style>
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/taxcoverage.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/taxcoverage.ftl
index c62751b8a4..dcce83e980 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/taxcoverage.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/taxcoverage.ftl
@@ -176,6 +176,8 @@
                 allowClear: true,
                 theme: 'bootstrap4'
             });
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <title><@s.text name='manage.metadata.taxcoverage.title'/></title>
diff --git a/src/main/webapp/WEB-INF/pages/manage/eml/tempcoverage.ftl b/src/main/webapp/WEB-INF/pages/manage/eml/tempcoverage.ftl
index 3939be8dba..68f743df68 100644
--- a/src/main/webapp/WEB-INF/pages/manage/eml/tempcoverage.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/eml/tempcoverage.ftl
@@ -350,6 +350,8 @@
 
                 hideProcessing();
             }
+
+            makeSureResourceParameterIsPresentInURL('${resource.shortname}');
         });
     </script>
     <style>
diff --git a/src/main/webapp/WEB-INF/pages/manage/overview_metadata.ftl b/src/main/webapp/WEB-INF/pages/manage/overview_metadata.ftl
index 22cb09e116..71b49af39a 100644
--- a/src/main/webapp/WEB-INF/pages/manage/overview_metadata.ftl
+++ b/src/main/webapp/WEB-INF/pages/manage/overview_metadata.ftl
@@ -21,6 +21,13 @@
 
         <div class="d-flex justify-content-end">
             <#if dataPackageResource>
+                <a id="download-metadata-button" class="text-gbif-header-2 icon-button icon-material-actions overview-action-button" type="button" href="${baseURL}/manage/eml.do?r=${resource.shortname}" onClick="_gaq.push(['_trackEvent', 'EML', 'Download', '${resource.shortname}']);" download>
+                    <svg class="overview-action-button-icon" focusable="false" aria-hidden="true" viewBox="0 0 24 24">
+                        <path d="M5 20h14v-2H5zM19 9h-4V3H9v6H5l7 7z"></path>
+                    </svg>
+                    <@s.text name="button.download"/>
+                </a>
+
                 <a id="upload-metadata-button" class="text-gbif-header-2 icon-button icon-material-actions overview-action-button" type="button" href="#">
                     <svg class="overview-action-button-icon" focusable="false" aria-hidden="true" viewBox="0 0 24 24">
                         <path d="M5 20h14v-2H5v2zm0-10h4v6h6v-6h4l-7-7-7 7z"></path>
@@ -52,6 +59,13 @@
                     </a>
                 </#if>
             <#else>
+                <a id="download-metadata-button" class="text-gbif-header-2 icon-button icon-material-actions overview-action-button" type="button" href="${baseURL}/manage/eml.do?r=${resource.shortname}" onClick="_gaq.push(['_trackEvent', 'EML', 'Download', '${resource.shortname}']);" download>
+                    <svg class="overview-action-button-icon" focusable="false" aria-hidden="true" viewBox="0 0 24 24">
+                        <path d="M5 20h14v-2H5zM19 9h-4V3H9v6H5l7 7z"></path>
+                    </svg>
+                    <@s.text name="button.download"/>
+                </a>
+
                 <a id="upload-metadata-button" class="text-gbif-header-2 icon-button icon-material-actions overview-action-button" type="button" href="#">
                     <svg class="overview-action-button-icon" focusable="false" aria-hidden="true" viewBox="0 0 24 24">
                         <path d="M5 20h14v-2H5v2zm0-10h4v6h6v-6h4l-7-7-7 7z"></path>
diff --git a/src/main/webapp/WEB-INF/pages/portal/resource_dp.ftl b/src/main/webapp/WEB-INF/pages/portal/resource_dp.ftl
index d97fa952f9..4a0e752823 100644
--- a/src/main/webapp/WEB-INF/pages/portal/resource_dp.ftl
+++ b/src/main/webapp/WEB-INF/pages/portal/resource_dp.ftl
@@ -549,10 +549,6 @@
                                             <th class="col-4"><@s.text name="portal.resource.taxonomic.taxonId"/></th>
                                             <td>${tx.taxonID!}</td>
                                         </tr>
-                                        <tr>
-                                            <th class="col-4"><@s.text name="portal.resource.taxonomic.taxonIdReference"/></th>
-                                            <td>${tx.taxonIDReference!}</td>
-                                        </tr>
                                         <tr>
                                             <th class="col-4"><@s.text name="portal.resource.taxonomic.scientificName"/></th>
                                             <td>${tx.scientificName!}</td>
diff --git a/src/main/webapp/js/global.js b/src/main/webapp/js/global.js
index 7e1d6a0627..10b602ff57 100644
--- a/src/main/webapp/js/global.js
+++ b/src/main/webapp/js/global.js
@@ -88,3 +88,15 @@ function setRippleElement(e) {
         dot.style.top = y + '%';
     });
 }
+
+function makeSureResourceParameterIsPresentInURL(resourceShortname) {
+    const currentUrl = window.location.href;
+    const url = new URL(currentUrl);
+
+    const searchParams = url.searchParams;
+
+    if (!searchParams.has('r')) {
+        searchParams.set('r', resourceShortname);
+        window.history.replaceState({}, '', url.toString());
+    }
+}