diff --git a/core/src/main/java/org/fao/geonet/util/XslUtil.java b/core/src/main/java/org/fao/geonet/util/XslUtil.java
index d6514ffd045..74a75f436dd 100644
--- a/core/src/main/java/org/fao/geonet/util/XslUtil.java
+++ b/core/src/main/java/org/fao/geonet/util/XslUtil.java
@@ -1581,7 +1581,11 @@ private static List<Element> buildRecordLink(List<Hit> hits, String type) {
     public static String escapeForJson(String value) {
         return StringEscapeUtils.escapeJson(value);
     }
-  
+
+    public static String escapeForEcmaScript(String value) {
+        return StringEscapeUtils.escapeEcmaScript(value);
+    }
+
     public static String getWebAnalyticsService() {
         ApplicationContext applicationContext = ApplicationContextHolder.get();
         WebAnalyticsConfiguration webAnalyticsConfiguration = applicationContext.getBean(WebAnalyticsConfiguration.class);
diff --git a/schemas/config-editor.xsd b/schemas/config-editor.xsd
index 31455f489a3..b98b85fd1a6 100644
--- a/schemas/config-editor.xsd
+++ b/schemas/config-editor.xsd
@@ -1094,6 +1094,7 @@ the mandatory section with no name and then the inner elements.
         </xs:element>
         <xs:element ref="action"/>
         <xs:element ref="directive"/>
+        <xs:element ref="select"/>
         <xs:element ref="text"/>
         <xs:element ref="xsl"/>
         <xs:element ref="section"/>
@@ -2530,4 +2531,66 @@ added in the directive panel eg. `text` for guidelines or add `action` to easily
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+
+
+  <xs:element name="select">
+    <xs:annotation>
+      <xs:documentation><![CDATA[
+
+Create a selector on an element to minimize form size when complex elements are repeated.
+For example, a feature catalogue can describe many feature types. Instead of displaying
+all feature types, add a dropdown (or tabs) to select one and edit it.
+
+The selector will add the parameter with the selected value to the form.
+
+Add a dynamic section with a reference to that parameter to build the editor form for the requested element.
+
+.. code-block:: xml
+
+          <section name="gfc:featureType">
+            <select name="Select a feature type"
+                    xpath="/gfc:FC_FeatureCatalogue/gfc:featureType"
+                    parameter="featureType"
+                    value="*/gfc:typeName/gco:LocalName/text()"
+                    layout="dropdown"/>
+
+
+            <field xpath="/gfc:FC_FeatureCatalogue/gfc:featureType[
+                                    */gfc:typeName/gco:LocalName = $p2/featureType
+                                    or (not($p2/featureType) and position() = 1)
+                                    or ($p3 = 'md.format.html')]"
+                     or="featureType"
+                     in="/gfc:FC_FeatureCatalogue"/>
+          </section>
+
+
+`$p2` correspond to the variable `request` and `$p3` to the `service` in the XSL template (see `base-variables.xsl`).
+So if there is no `featureType` parameter, the first feature type will be displayed.
+If the view mode is `md.format.html`, all feature types will be displayed.
+
+      ]]></xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="name" use="optional" type="xs:string"/>
+      <xs:attribute name="xpath" use="required" type="xs:string"/>
+      <xs:attribute name="parameter" use="required" type="xs:string"/>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+      <xs:attribute name="icon" use="required" type="xs:string">
+        <xs:annotation>
+          <xs:documentation><![CDATA[Icon display on the dropdown selector.]]>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="layout" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="dropdown"/>
+            <xs:enumeration value="tabs"/>
+            <xs:enumeration value="pills"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:anyAttribute/>
+    </xs:complexType>
+  </xs:element>
 </xs:schema>
diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/evaluate.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/evaluate.xsl
index 24a75952dd1..6f6f966deb3 100644
--- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/evaluate.xsl
+++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/evaluate.xsl
@@ -42,6 +42,6 @@
   <xsl:template name="evaluate-dublin-core">
     <xsl:param name="base" as="node()"/>
     <xsl:param name="in"/>
-    <xsl:copy-of select="saxon:evaluate(concat('$p1', $in), $base)"/>
+    <xsl:copy-of select="saxon:evaluate(concat('$p1', $in), $base, $request, $service)"/>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/formatter/iso19115-3_2018/view.xsl b/schemas/iso19110/src/main/plugin/iso19110/formatter/iso19115-3.2018/view.xsl
similarity index 100%
rename from schemas/iso19110/src/main/plugin/iso19110/formatter/iso19115-3_2018/view.xsl
rename to schemas/iso19110/src/main/plugin/iso19110/formatter/iso19115-3.2018/view.xsl
diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml b/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml
index 4b628b2ff22..f4302ec2611 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml
@@ -65,7 +65,8 @@
 
   <!-- View configuration -->
   <views>
-    <view name="default" default="true">
+    <view name="default" default="true"
+          class="gn-label-above-input gn-indent-bluescale">
       <sidePanel>
         <directive data-gn-need-help="creating-metadata"/>
         <directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
@@ -91,7 +92,8 @@
                  in="/gfc:FC_FeatureCatalogue"/>
           <field xpath="/gfc:FC_FeatureCatalogue/gfc:functionalLanguage" or="functionalLanguage"
                  in="/gfc:FC_FeatureCatalogue"/>
-          <field xpath="/gfc:FC_FeatureCatalogue/gfc:featureType" or="featureType" in="/gfc:FC_FeatureCatalogue"/>
+          <field xpath="/gfc:FC_FeatureCatalogue/gfc:featureType" or="featureType"
+                 in="/gfc:FC_FeatureCatalogue"/>
 
           <action type="suggest"
                   process="add-columns-from-csv"/>
@@ -99,10 +101,13 @@
       </tab>
       <flatModeExceptions>
         <for name="gfc:code"/>
+        <for name="gfc:featureType"/>
+        <for name="gfc:carrierOfCharacteristics"/>
         <for name="gfc:listedValue"/>
       </flatModeExceptions>
     </view>
-    <view name="advanced">
+    <view name="advanced"
+          class="gn-label-above-input gn-indent-bluescale">
       <sidePanel>
         <directive data-gn-need-help="creating-metadata"/>
         <directive data-gn-validation-report=""/>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/evaluate.xsl b/schemas/iso19110/src/main/plugin/iso19110/layout/evaluate.xsl
index da93e2e4bbf..6369603bc20 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/layout/evaluate.xsl
+++ b/schemas/iso19110/src/main/plugin/iso19110/layout/evaluate.xsl
@@ -47,6 +47,22 @@
   <xsl:template name="evaluate-iso19110">
     <xsl:param name="base" as="node()"/>
     <xsl:param name="in"/>
-    <xsl:copy-of select="saxon:evaluate(concat('$p1', $in), $base)"/>
+
+    <xsl:variable name="nodeOrAttribute" select="saxon:evaluate(concat('$p1', $in), $base, $request, $service)"/>
+
+    <xsl:choose>
+      <xsl:when test="$nodeOrAttribute instance of text()+">
+        <xsl:value-of select="$nodeOrAttribute"/>
+      </xsl:when>
+      <xsl:when test="$nodeOrAttribute instance of element()+">
+        <xsl:copy-of select="$nodeOrAttribute"/>
+      </xsl:when>
+      <xsl:when test="$nodeOrAttribute instance of attribute()+">
+        <xsl:value-of select="$nodeOrAttribute"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$nodeOrAttribute"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/layout.xsl b/schemas/iso19110/src/main/plugin/iso19110/layout/layout.xsl
index 531e04498d5..18caff32a69 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/layout/layout.xsl
+++ b/schemas/iso19110/src/main/plugin/iso19110/layout/layout.xsl
@@ -22,10 +22,12 @@
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gmd="http://www.isotc211.org/2005/gmd"
+<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:gmx="http://www.isotc211.org/2005/gmx"
                 xmlns:gfc="http://www.isotc211.org/2005/gfc"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:gn="http://www.fao.org/geonetwork"
                 xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata"
                 xmlns:gn-fn-iso19110="http://geonetwork-opensource.org/xsl/functions/profiles/iso19110"
@@ -38,7 +40,7 @@
   <xsl:include href="layout-custom-fields.xsl"/>
 
   <!-- Ignore all gn element -->
-  <xsl:template mode="mode-iso19110" match="gn:*|@gn:*" priority="1000"/>
+  <xsl:template mode="mode-iso19110" match="gn:*|@gn:*|@id|@uuid" priority="1000"/>
 
 
   <!-- Template to display non existing element ie. geonet:child element
@@ -70,6 +72,43 @@
   </xsl:template>
 
 
+  <xsl:template mode="mode-iso19110"
+                match="gfc:featureType"
+                priority="2000">
+
+    <xsl:variable name="isFirstFeatureType"
+                  select="preceding-sibling::*[1]/name() != 'gfc:featureType'"
+                  as="xs:boolean"/>
+
+    <xsl:if test="$isFirstFeatureType">
+      <xsl:variable name="selector" as="node()*">
+        <select name="selectFeaturetype"
+                icon="fa gn-icon-featureCatalog"
+                xpath="/gfc:FC_FeatureCatalogue/gfc:featureType"
+                parameter="featureType"
+                value="*/gfc:typeName/gco:LocalName/text()"
+                layout="dropdown"/>
+      </xsl:variable>
+      <xsl:apply-templates mode="form-builder"
+                           select="$selector">
+        <xsl:with-param name="base" select="ancestor::gfc:FC_FeatureCatalogue"/>
+      </xsl:apply-templates>
+    </xsl:if>
+
+    <xsl:variable name="isRequestedFeatureType"
+                  select="*/gfc:typeName/gco:LocalName = $request/featureType"/>
+
+    <xsl:variable name="isRequestedFeatureTypeInCurrentRecord"
+                  select="count(../gfc:featureType[*/gfc:typeName/gco:LocalName = $request/featureType]) > 0"/>
+
+    <xsl:if test="$isRequestedFeatureType
+                  or (not($isRequestedFeatureTypeInCurrentRecord) and $isFirstFeatureType)
+                  or ($service = 'md.format.html')">
+      <xsl:call-template name="mode-iso19110-fieldset"/>
+    </xsl:if>
+  </xsl:template>
+
+
   <!-- Visit all XML tree recursively -->
   <xsl:template mode="mode-iso19110" match="gfc:*">
     <xsl:apply-templates mode="mode-iso19110" select="*|@*"/>
@@ -85,6 +124,7 @@
 
   <!-- Boxed element -->
   <xsl:template mode="mode-iso19110" priority="200"
+                name="mode-iso19110-fieldset"
                 match="gfc:*[gfc:FC_FeatureType]|
     gfc:*[gfc:FC_AssociationRole]|
     gfc:*[gfc:FC_AssociationOperation]|
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/ara/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/ara/strings.xml
index 8d7acef606a..4cea12eae8d 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/ara/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/ara/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/cat/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/cat/strings.xml
index 6c4d7fbc6ea..21d46821ade 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/cat/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/cat/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Complet</advanced>
   <default>Senzill</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/chi/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/chi/strings.xml
index 8d7acef606a..4cea12eae8d 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/chi/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/chi/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/dut/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/dut/strings.xml
index 9559fdef554..898c6bee31f 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/dut/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/dut/strings.xml
@@ -27,6 +27,8 @@
   <xml_iso19110Tooai_dc>Save this metadata as an OAI Dublin Core XML file</xml_iso19110Tooai_dc>
 
   <advanced>Volledig</advanced>
-  <default>Eenvoudig</default>
+  <default>Standaard</default>
   <xml>XML</xml>
+  <selectFeaturetype>Selecteer een objecttype</selectFeaturetype>
+  <missingFeatureTypeName>Nieuw objecttype</missingFeatureTypeName>
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/eng/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/eng/strings.xml
index f93d042a634..abbb61cf691 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/eng/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/eng/strings.xml
@@ -30,4 +30,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/fin/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/fin/strings.xml
index 8d7acef606a..4cea12eae8d 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/fin/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/fin/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/fre/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/fre/strings.xml
index f5c8dc7ea58..a83ee788514 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/fre/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/fre/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Complète</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/ger/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/ger/strings.xml
index 8d7acef606a..4cea12eae8d 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/ger/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/ger/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/ita/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/ita/strings.xml
index 8d7acef606a..4cea12eae8d 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/ita/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/ita/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/nor/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/nor/strings.xml
index 8d7acef606a..4cea12eae8d 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/nor/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/nor/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/por/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/por/strings.xml
index ed38163cfa4..fb3d490327f 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/por/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/por/strings.xml
@@ -30,4 +30,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/rus/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/rus/strings.xml
index 8d7acef606a..4cea12eae8d 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/rus/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/rus/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/slo/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/slo/strings.xml
index b338a111d7d..0cca1aaefd8 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/slo/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/slo/strings.xml
@@ -28,4 +28,7 @@
   <advanced>Celý rozsah</advanced>
   <default>Jednoduchý</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
\ No newline at end of file
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/spa/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/spa/strings.xml
index 83dbe5f054d..86b352d7993 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/spa/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/spa/strings.xml
@@ -29,4 +29,7 @@
   <advanced>Completo</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/loc/tur/strings.xml b/schemas/iso19110/src/main/plugin/iso19110/loc/tur/strings.xml
index f93d042a634..abbb61cf691 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/loc/tur/strings.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/loc/tur/strings.xml
@@ -30,4 +30,7 @@
   <advanced>Full</advanced>
   <default>Simple</default>
   <xml>XML</xml>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 </strings>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/convert/ISO19139/mapping/core.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/convert/ISO19139/mapping/core.xsl
index 836307a2977..3ea94a69499 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/convert/ISO19139/mapping/core.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/convert/ISO19139/mapping/core.xsl
@@ -79,6 +79,16 @@
     <xsl:value-of select="."/>
   </xsl:template>
 
+  <!--
+  Feature Catalogue cardinality is changed from a gco:Multiplicity to a CharacterString
+  -->
+  <xsl:template match="gfcold:cardinality" priority="5" mode="from19139to19115-3.2018">
+    <gfc:cardinality>
+      <gco:CharacterString>
+        <xsl:value-of select="concat(*/gcoold:range/*/gcoold:lower/*/text(), '..', */gcoold:range/*/gcoold:upper/*/text())"/>
+      </gco:CharacterString>
+    </gfc:cardinality>
+  </xsl:template>
 
   <xsl:template match="gmd:language|gmd:locale" priority="5" mode="from19139to19115-3.2018">
     <xsl:variable name="nameSpacePrefix">
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/evaluate.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/evaluate.xsl
index 1986d1c51ff..a5c19fb1a13 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/evaluate.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/evaluate.xsl
@@ -38,7 +38,7 @@
     <xsl:param name="in"/>
     <!-- <xsl:message>in xml <xsl:copy-of select="$base"></xsl:copy-of></xsl:message>
      <xsl:message>search for <xsl:copy-of select="$in"></xsl:copy-of></xsl:message>-->
-    <xsl:variable name="nodeOrAttribute" select="saxon:evaluate(concat('$p1', $in), $base)"/>
+    <xsl:variable name="nodeOrAttribute" select="saxon:evaluate(concat('$p1', $in), $base, $request, $service)"/>
 
     <xsl:choose>
       <xsl:when test="$nodeOrAttribute instance of text()+">
@@ -61,7 +61,7 @@
     <xsl:param name="base" as="node()"/>
     <xsl:param name="in"/>
 
-    <xsl:value-of select="saxon:evaluate(concat('$p1', $in), $base)"/>
+    <xsl:value-of select="saxon:evaluate(concat('$p1', $in), $base, $request, $service)"/>
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-feature-catalogue.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-feature-catalogue.xsl
new file mode 100644
index 00000000000..cc5789c364f
--- /dev/null
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-feature-catalogue.xsl
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
+  xmlns:gfc="http://standards.iso.org/iso/19110/gfc/1.1"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  exclude-result-prefixes="#all">
+
+
+  <xsl:template mode="mode-iso19115-3.2018"
+                match="gfc:featureType"
+                priority="2000">
+
+    <xsl:variable name="isFirstFeatureType"
+                  select="preceding-sibling::*[1]/name() != 'gfc:featureType'"
+                  as="xs:boolean"/>
+
+    <xsl:if test="$isFirstFeatureType">
+      <xsl:variable name="selector" as="node()*">
+        <select name="selectFeaturetype"
+                icon="fa gn-icon-featureCatalog"
+                xpath="/gfc:FC_FeatureCatalogue/gfc:featureType"
+                parameter="featureType"
+                value="*/gfc:typeName/text()"
+                layout="dropdown"/>
+      </xsl:variable>
+      <xsl:apply-templates mode="form-builder"
+                           select="$selector">
+        <xsl:with-param name="base" select="ancestor::gfc:FC_FeatureCatalogue"/>
+      </xsl:apply-templates>
+    </xsl:if>
+
+    <xsl:variable name="isRequestedFeatureType"
+                  select="*/gfc:typeName = $request/featureType"/>
+
+    <xsl:variable name="isRequestedFeatureTypeInCurrentRecord"
+                  select="count(../gfc:featureType[*/gfc:typeName = $request/featureType]) > 0"/>
+
+    <xsl:if test="$isRequestedFeatureType
+                  or (not($isRequestedFeatureTypeInCurrentRecord) and $isFirstFeatureType)
+                  or ($service = 'md.format.html')">
+      <xsl:call-template name="mode-iso19115-3.2018-fieldset"/>
+    </xsl:if>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout.xsl
index 4f807c0ecde..de8f4a0981f 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout.xsl
@@ -34,6 +34,7 @@
   <xsl:include href="layout-custom-fields-date.xsl"/>
   <xsl:include href="layout-custom-fields-contact.xsl"/>
   <xsl:include href="layout-custom-fields-keywords.xsl"/>
+  <xsl:include href="layout-custom-feature-catalogue.xsl"/>
 
   <!-- Visit all XML tree recursively -->
   <xsl:template mode="mode-iso19115-3.2018"
@@ -139,6 +140,7 @@
       * and not(gco:CharacterString): Don't take into account those having gco:CharacterString (eg. multilingual elements)
   -->
   <xsl:template mode="mode-iso19115-3.2018" priority="200"
+                name="mode-iso19115-3.2018-fieldset"
                 match="*[name() = $editorConfig/editor/fieldsWithFieldset/name
                           or @gco:isoType = $editorConfig/editor/fieldsWithFieldset/name]|
                         *[namespace-uri(.) != $gnUri and $isFlatMode = false() and
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/strings.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/strings.xml
index b3a0372af0a..21fa0925a45 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/strings.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/strings.xml
@@ -15,6 +15,9 @@
   <enum1>Value </enum1>
   <enum2> is not valid for the field </enum2>
   <enum3>Potential values are: </enum3>
+  <selectFeaturetype>Select a feature type</selectFeaturetype>
+  <missingFeatureTypeName>New feature type</missingFeatureTypeName>
+
 
 
   <understandResource>Information about the dataset</understandResource>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/strings.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/strings.xml
index cce5262ac02..081e6c15497 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/strings.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/strings.xml
@@ -14,6 +14,8 @@
   <enum1>La valeur </enum1>
   <enum2> n'est pas valide pour le champ </enum2>
   <enum3>Les valeurs possibles sont : </enum3>
+  <selectFeaturetype>Choisir une table attributaire</selectFeaturetype>
+  <missingFeatureTypeName>Nouvelle table</missingFeatureTypeName>
 
   <understandResource>Comprendre la ressource</understandResource>
   <relatedResources>Service disponible et données associées</relatedResources>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/evaluate.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/evaluate.xsl
index 658267593e1..e174c834b4b 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/evaluate.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/evaluate.xsl
@@ -58,7 +58,7 @@
     <xsl:param name="in"/>
     <!-- <xsl:message>in xml <xsl:copy-of select="$base"></xsl:copy-of></xsl:message>
      <xsl:message>search for <xsl:copy-of select="$in"></xsl:copy-of></xsl:message>-->
-    <xsl:variable name="nodeOrAttribute" select="saxon:evaluate(concat('$p1', $in), $base)"/>
+    <xsl:variable name="nodeOrAttribute" select="saxon:evaluate(concat('$p1', $in), $base, $request, $service)"/>
 
     <xsl:choose>
       <xsl:when test="$nodeOrAttribute instance of text()+">
@@ -81,7 +81,7 @@
     <xsl:param name="base" as="node()"/>
     <xsl:param name="in"/>
 
-    <xsl:value-of select="saxon:evaluate(concat('$p1', $in), $base)"/>
+    <xsl:value-of select="saxon:evaluate(concat('$p1', $in), $base, $request, $service)"/>
   </xsl:template>
 
 
diff --git a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
index 8b13819cb51..b651eab7649 100644
--- a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
+++ b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
@@ -321,8 +321,7 @@
             // properly without removing them. There is maybe
             // references to DOM objects in the JS code which
             // make those objects not reachable by GC.
-            $(gnCurrentEdit.containerId).find("*").remove();
-
+            $(gnCurrentEdit.containerId).empty();
             $(gnCurrentEdit.containerId).replaceWith(snippet);
 
             if (gnCurrentEdit.compileScope) {
diff --git a/web-ui/src/main/resources/catalog/js/edit/EditorController.js b/web-ui/src/main/resources/catalog/js/edit/EditorController.js
index 6f160e6f3c6..6327b8c86c4 100644
--- a/web-ui/src/main/resources/catalog/js/edit/EditorController.js
+++ b/web-ui/src/main/resources/catalog/js/edit/EditorController.js
@@ -478,6 +478,26 @@
         return gnMetadataActions.startVersioning(gnCurrentEdit.id);
       };
 
+      $scope.switchToTabWithParam = function (name, value) {
+        var inputForParameter = $("#" + name)[0];
+        if (inputForParameter) {
+          inputForParameter.value = value;
+        } else {
+          inputForParameter = $("<input>")
+            .attr({
+              type: "hidden",
+              id: name,
+              name: name,
+              value: value
+            })
+            .appendTo($(gnCurrentEdit.formId));
+        }
+        $scope.switchToTab(
+          gnCurrentEdit.tab,
+          $("#flat")[0].value === "true" ? "flat" : ""
+        );
+      };
+
       /**
        * Update the form according to the target tab
        * properties and save.
diff --git a/web/src/main/webapp/xslt/common/base-variables.xsl b/web/src/main/webapp/xslt/common/base-variables.xsl
index 0385a3252f7..e66718bab73 100644
--- a/web/src/main/webapp/xslt/common/base-variables.xsl
+++ b/web/src/main/webapp/xslt/common/base-variables.xsl
@@ -44,6 +44,7 @@
 
   <!-- The current service name -->
   <xsl:variable name="service" select="/root/gui/reqService"/>
+  <xsl:variable name="request" select="/root/request"/>
 
   <xsl:variable name="i18n" select="/root/gui/i18n"/>
   <!-- Used by SearchApi loading translation from JSON locale files. -->
diff --git a/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl b/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl
index 2e423b7ea75..d342960844c 100644
--- a/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl
+++ b/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl
@@ -26,6 +26,7 @@
                 xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata"
                 xmlns:gn="http://www.fao.org/geonetwork"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:util="java:org.fao.geonet.util.XslUtil"
                 xmlns:saxon="http://saxon.sf.net/"
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all" version="2.0">
@@ -262,6 +263,120 @@
     </xsl:for-each>
   </xsl:template>
 
+  <!--
+  <select name="Choose a feature type"
+          xpath="/gfc:FC_FeatureCatalogue/gfc:featureType"
+          parameter="featureType"
+          value="*/gfc:typeName/gco:LocalName"
+          layout="list|tab|dropdown"/>
+  -->
+  <xsl:template mode="form-builder" match="select">
+    <xsl:param name="base" as="node()"/>
+
+    <xsl:variable name="parameter" select="@parameter" as="xs:string"/>
+    <xsl:variable name="value" select="@value" as="xs:string"/>
+    <xsl:variable name="icon" select="@icon"/>
+    <xsl:variable name="labelKey" select="@name"/>
+    <xsl:variable name="layout" select="@layout" as="xs:string"/>
+
+    <!-- Depending on the context, we need to prefix the xpath
+      to work in evaluate function. If root element eg. /gmd:MD_Metadata...
+      then we prepend /.. if a child node, we use current. -->
+    <xsl:variable name="xpathPrefix"
+                  select="if (starts-with(@xpath, '/'))
+                                    then '/..'
+                                    else '/'"/>
+
+    <xsl:variable name="nodes" as="node()*">
+      <saxon:call-template name="{concat('evaluate-', $schema)}">
+        <xsl:with-param name="base" select="$base"/>
+        <xsl:with-param name="in"
+                        select="concat($xpathPrefix, @xpath)"/>
+      </saxon:call-template>
+    </xsl:variable>
+
+    <xsl:if test="count($nodes) > 1">
+
+      <xsl:variable name="selectorLabel"
+                    select="if (contains($labelKey, ':'))
+                            then gn-fn-metadata:getLabel($schema, $labelKey, $labels)/label
+                            else if ($strings/*[name() = $labelKey] != '')
+                            then $strings/*[name() = $labelKey]
+                            else $labelKey"
+      />
+
+      <xsl:variable name="listOfNodes" as="node()*">
+        <xsl:for-each select="$nodes">
+          <item>
+            <xsl:variable name="featureTypeKey">
+              <saxon:call-template name="{concat('evaluate-', $schema)}">
+                <xsl:with-param name="base" select="current()"/>
+                <xsl:with-param name="in" select="concat('/', $value)"/>
+              </saxon:call-template>
+            </xsl:variable>
+
+            <xsl:attribute name="featureTypeKey"
+                           select="$featureTypeKey"/>
+            <xsl:attribute name="isRequestedFeatureType"
+                           select="$request/*[name() = $parameter] = $featureTypeKey"/>
+            <xsl:copy-of select="."/>
+          </item>
+        </xsl:for-each>
+      </xsl:variable>
+
+
+      <xsl:variable name="choices">
+        <ul class="{if ($layout = 'dropdown') then 'dropdown-menu' else concat('nav nav-', $layout)}">
+          <xsl:variable name="isRequestedFeatureTypeFound"
+                        select="$listOfNodes/@isRequestedFeatureType = 'true'"
+                        as="xs:boolean"/>
+
+          <xsl:for-each select="$listOfNodes">
+            <li>
+              <xsl:if test="@isRequestedFeatureType = 'true'
+                          or (not($isRequestedFeatureTypeFound) and position() = 1)">
+                <xsl:attribute name="class" select="if ($layout = 'dropdown') then 'disabled' else 'active'"/>
+                <input type="hidden" id="{$parameter}" name="{$parameter}" value="{@featureTypeKey}"/>
+              </xsl:if>
+              <a data-ng-click="switchToTabWithParam('{$parameter}', '{util:escapeForEcmaScript(@featureTypeKey)}')" href="">
+                <xsl:value-of select="if (@featureTypeKey != '') then @featureTypeKey else $strings/*[name() = 'missingFeatureTypeName']"/>
+              </a>
+            </li>
+          </xsl:for-each>
+        </ul>
+      </xsl:variable>
+
+      <xsl:variable name="fieldTitle">
+        <xsl:if test="$icon">
+          <i class="fa fa-fw {$icon}"></i>
+        </xsl:if>
+        <xsl:value-of select="$selectorLabel"/>
+      </xsl:variable>
+
+      <div class="form-group gn-field col-sm-12">
+        <xsl:choose>
+          <xsl:when test="$layout = 'dropdown'">
+            <div class="dropdown">
+              <button class="btn btn-default dropdown-toggle" type="button"
+                      data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                <xsl:copy-of select="$fieldTitle"/>
+                <span class="caret"></span>
+              </button>
+              <xsl:copy-of select="$choices"/>
+            </div>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:if test="$selectorLabel != ''">
+              <label>
+                <xsl:copy-of select="$fieldTitle"/>
+              </label>
+            </xsl:if>
+            <xsl:copy-of select="$choices"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </div>
+    </xsl:if>
+  </xsl:template>
 
 
   <!-- Element to ignore in that mode -->