diff --git a/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml b/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
index 64fbc551def6..d94d1145ee45 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
@@ -285,6 +285,17 @@
             <scope visibility="hidden" visibilityOutside="hidden">submission</scope>
         </step-definition>
 
+        <step-definition id="green" mandatory="true">
+            <heading>submit.progressbar.describe.green</heading>
+            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+            <type>submission-form</type>
+        </step-definition>
+        <step-definition id="orange" mandatory="true">
+            <heading>submit.progressbar.describe.green</heading>
+            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+            <type>submission-form</type>
+        </step-definition>
+
     </step-definitions>
 
     <!-- The submission-definitions map lays out the detailed definition of -->
@@ -457,6 +468,17 @@
             <step id="controlled-vocabulary-test"/>
         </submission-process>
 
+        <submission-process name="green">
+            <step id="extractionstep" />
+            <step id="green" />
+            <step id="upload" />
+        </submission-process>
+        <submission-process name="orange">
+            <step id="extractionstep" />
+            <step id="orange" />
+            <step id="upload" />
+        </submission-process>
+
     </submission-definitions>
 
 </item-submission>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/modules/authority.cfg b/dspace-api/src/test/data/dspaceFolder/config/modules/authority.cfg
new file mode 100644
index 000000000000..10e4bc36fbb9
--- /dev/null
+++ b/dspace-api/src/test/data/dspaceFolder/config/modules/authority.cfg
@@ -0,0 +1,285 @@
+#---------------------------------------------------------------#
+#----------------- AUTHORITY CONFIGURATIONS --------------------#
+#---------------------------------------------------------------#
+# These configs are used by the authority framework             #
+#---------------------------------------------------------------#
+
+## The DCInputAuthority plugin is automatically configured with every
+## value-pairs element in input-forms.xml, namely:
+##   common_identifiers, common_types, common_iso_languages
+##
+## The DSpaceControlledVocabulary plugin is automatically configured
+## with every *.xml file in [dspace]/config/controlled-vocabularies,
+## and creates a plugin instance for each, using base filename as the name.
+## eg: nsi, srsc.
+## Each DSpaceControlledVocabulary plugin comes with three configuration options:
+# vocabulary.plugin._plugin_.hierarchy.store = <true|false>    # default: true
+# vocabulary.plugin._plugin_.hierarchy.suggest = <true|false>  # default: false
+# vocabulary.plugin._plugin_.delimiter = "<string>"            # default: "::"
+##
+## An example using "srsc" can be found later in this section
+
+plugin.selfnamed.org.dspace.content.authority.ChoiceAuthority = \
+ org.dspace.content.authority.DCInputAuthority, \
+ org.dspace.content.authority.DSpaceControlledVocabulary
+ 
+ ##
+## This sets the default lowest confidence level at which a metadata value is included
+## in an authority-controlled browse (and search) index.  It is a symbolic
+## keyword, one of the following values (listed in descending order):
+##   accepted
+##   uncertain
+##   ambiguous
+##   notfound
+##   failed
+##   rejected
+##   novalue
+##   unset
+## See manual or org.dspace.content.authority.Choices source for descriptions.
+authority.minconfidence = ambiguous
+
+# Configuration settings for ORCID based authority control.
+# Uncomment the lines below to enable configuration
+#choices.plugin.dc.contributor.author = SolrAuthorAuthority
+#choices.presentation.dc.contributor.author = authorLookup
+#authority.controlled.dc.contributor.author = true
+#authority.author.indexer.field.1=dc.contributor.author
+
+##
+## This sets the lowest confidence level at which a metadata value is included
+## in an authority-controlled browse (and search) index.  It is a symbolic
+## keyword from the same set as for the default "authority.minconfidence"
+#authority.minconfidence.dc.contributor.author = accepted
+
+## demo: subject code autocomplete, using srsc as authority
+## (DSpaceControlledVocabulary plugin must be enabled)
+## Warning: when enabling this feature any controlled vocabulary configuration in the input-forms.xml for the metadata field will be overridden.
+#vocabulary.plugin.srsc.hierarchy.store = true
+#vocabulary.plugin.srsc.hierarchy.suggest = true
+#vocabulary.plugin.srsc.delimiter = "::"
+
+# publisher name lookup through SHERPA/RoMEO:
+#choices.plugin.dc.publisher = SRPublisher
+#choices.presentation.dc.publisher = suggest
+
+## demo: journal title lookup, with ISSN as authority
+#choices.plugin.dc.title.alternative = SRJournalTitle
+#choices.presentation.dc.title.alternative = suggest
+#authority.controlled.dc.title.alternative = true
+ 
+#####  Authority Control Settings  #####
+#plugin.named.org.dspace.content.authority.ChoiceAuthority = \
+# org.dspace.content.authority.SampleAuthority = Sample, \
+# org.dspace.content.authority.SHERPARoMEOPublisher = SRPublisher, \
+# org.dspace.content.authority.SHERPARoMEOJournalTitle = SRJournalTitle, \
+# org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
+
+#Uncomment to enable ORCID authority control
+#plugin.named.org.dspace.content.authority.ChoiceAuthority = \
+# org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
+
+#####  Authority Control Settings  #####
+plugin.named.org.dspace.content.authority.ChoiceAuthority = \
+ org.dspace.content.authority.OrcidAuthority = AuthorAuthority,\
+ org.dspace.content.authority.OrcidAuthority = EditorAuthority,\
+ org.dspace.content.authority.OrcidAuthority = AuthorStrictMatchAuthority, \
+ org.dspace.content.authority.OrcidAuthority = AuthorCoarseMatchAuthority, \
+ org.dspace.content.authority.ItemAuthority = DataSetAuthority,\
+ org.dspace.content.authority.ItemAuthority = JournalAuthority,\
+ org.dspace.content.authority.RorOrgUnitAuthority = OrgUnitAuthority,\
+ org.dspace.content.authority.ItemAuthority = ProjectAuthority,\
+ org.dspace.content.authority.OpenAIREProjectAuthority = FundingAuthority,\
+ org.dspace.content.authority.ItemAuthority = PublicationAuthority,\
+ org.dspace.content.authority.ItemAuthority = EquipmentAuthority,\
+ org.dspace.content.authority.EPersonAuthority = EPersonAuthority,\
+ org.dspace.content.authority.GroupAuthority = GroupAuthority,\
+ org.dspace.content.authority.ZDBAuthority = ZDBAuthority,\
+ org.dspace.content.authority.SherpaAuthority = SherpaAuthority
+ 
+cris.ItemAuthority.forceInternalName = true
+
+# AuthorStrictMatchAuthority configuration
+cris.ItemAuthority.AuthorStrictMatchAuthority.forceInternalName = false
+
+# AuthorCoarseMatchAuthority configuration
+cris.ItemAuthority.AuthorCoarseMatchAuthority.forceInternalName = false
+
+cris.ItemAuthority.DataSetAuthority.entityType = Product
+cris.ItemAuthority.JournalAuthority.entityType = Journal
+cris.ItemAuthority.OrgUnitAuthority.entityType = OrgUnit
+cris.ItemAuthority.ProjectAuthority.entityType = Project
+cris.ItemAuthority.FundingAuthority.entityType = Funding
+cris.ItemAuthority.PublicationAuthority.entityType = Publication
+cris.ItemAuthority.EquipmentAuthority.entityType = Equipment
+
+## OrcidAuthority Extras configuration
+#
+
+cris.OrcidAuthority.EditorAuthority.institution.key = oairecerif_editor_affiliation
+cris.OrcidAuthority.AuthorAuthority.institution.key = oairecerif_author_affiliation
+
+#cris.OrcidAuthority.AuthorAuthority.institution.display = true
+#cris.OrcidAuthority.AuthorAuthority.institution.as-data = true
+#
+#cris.OrcidAuthority.AuthorAuthority.orcid-id.key = person_identifier_orcid
+#cris.OrcidAuthority.AuthorAuthority.orcid-id.display = true
+#cris.OrcidAuthority.AuthorAuthority.orcid-id.as-data = true
+
+
+cris.SherpaAuthority.entityType = Journal
+cris.SherpaAuthority.local-item-choices-enabled = true
+
+ItemAuthority.reciprocalMetadata.Publication.dc.relation.product = dc.relation.publication
+ItemAuthority.reciprocalMetadata.Product.dc.relation.publication = dc.relation.product 
+
+choices.plugin.dc.contributor.author = AuthorAuthority
+choices.presentation.dc.contributor.author = suggest
+authority.controlled.dc.contributor.author = true
+
+choices.plugin.green.override.dc.contributor.author = AuthorStrictMatchAuthority
+choices.plugin.orange.override.dc.contributor.author = AuthorCoarseMatchAuthority
+
+choices.plugin.oairecerif.author.affiliation = OrgUnitAuthority
+choices.presentation.oairecerif.author.affiliation = suggest
+authority.controlled.oairecerif.author.affiliation = true
+
+choices.plugin.dc.contributor.editor = EditorAuthority
+choices.presentation.dc.contributor.editor = suggest
+authority.controlled.dc.contributor.editor = true
+
+choices.plugin.oairecerif.editor.affiliation = OrgUnitAuthority
+choices.presentation.oairecerif.editor.affiliation = suggest
+authority.controlled.oairecerif.editor.affiliation = true
+
+choices.plugin.dc.relation.product = DataSetAuthority
+choices.presentation.dc.relation.product = suggest
+authority.controlled.dc.relation.product = true
+
+choices.plugin.dc.relation.publication = PublicationAuthority
+choices.presentation.dc.relation.publication = suggest
+authority.controlled.dc.relation.publication = true
+
+choices.plugin.dc.relation.journal = SherpaAuthority
+choices.presentation.dc.relation.journal = suggest
+authority.controlled.dc.relation.journal = true
+
+choices.plugin.dc.relation.project = ProjectAuthority
+choices.presentation.dc.relation.project = suggest
+authority.controlled.dc.relation.project = true
+
+choices.plugin.dc.relation.funding = FundingAuthority
+choices.presentation.dc.relation.funding = suggest
+# the externalsource provider identifier
+choises.externalsource.dc.relation.funding = fundingAuthority
+authority.controlled.dc.relation.funding = true
+
+choices.plugin.dc.description.sponsorship = OrgUnitAuthority
+choices.presentation.dc.description.sponsorship = suggest
+authority.controlled.dc.description.sponsorship = true
+
+### authorities required by Projects
+choices.plugin.crispj.coordinator = OrgUnitAuthority
+choices.presentation.crispj.coordinator = suggest
+authority.controlled.crispj.coordinator = true
+
+choices.plugin.crispj.organization = OrgUnitAuthority
+choices.presentation.crispj.organization = suggest
+authority.controlled.crispj.organization = true
+
+choices.plugin.crispj.partnerou = OrgUnitAuthority
+choices.presentation.crispj.partnerou = suggest
+authority.controlled.crispj.partnerou = true
+
+choices.plugin.crispj.investigator = AuthorAuthority
+choices.presentation.crispj.investigator = suggest
+authority.controlled.crispj.investigator = true
+
+choices.plugin.crispj.coinvestigators = AuthorAuthority
+choices.presentation.crispj.coinvestigators = suggest
+authority.controlled.crispj.coinvestigators = true
+
+choices.plugin.dc.relation.equipment = EquipmentAuthority
+choices.presentation.dc.relation.equipment = suggest
+authority.controlled.dc.relation.equipment = true
+
+### authorities required by Person
+choices.plugin.person.affiliation.name = OrgUnitAuthority
+choices.presentation.person.affiliation.name = suggest
+authority.controlled.person.affiliation.name = true
+
+choices.plugin.oairecerif.person.affiliation = OrgUnitAuthority
+choices.presentation.oairecerif.person.affiliation = suggest
+authority.controlled.oairecerif.person.affiliation = true
+
+#choices.plugin.crisrp.workgroup = OrgUnitAuthority
+#choices.presentation.crisrp.workgroup = suggest
+#authority.controlled.crisrp.workgroup = true
+
+#choices.plugin.crisrp.qualification = OrgUnitAuthority
+#choices.presentation.crisrp.qualification = suggest
+#authority.controlled.crisrp.qualification = true
+
+#choices.plugin.crisrp.education = OrgUnitAuthority
+#choices.presentation.crisrp.education = suggest
+#authority.controlled.crisrp.education = true
+
+### authorities required by OrgUnit
+choices.plugin.organization.parentOrganization = OrgUnitAuthority
+choices.presentation.organization.parentOrganization = suggest
+authority.controlled.organization.parentOrganization = true
+
+choices.plugin.crisou.director= AuthorAuthority
+choices.presentation.crisou.director = suggest
+authority.controlled.crisou.director = true
+
+### authorities required by Funding
+choices.plugin.oairecerif.funder = OrgUnitAuthority
+choices.presentation.oairecerif.funder = suggest
+authority.controlled.oairecerif.funder = true
+
+choices.plugin.oairecerif.fundingParent = FundingAuthority
+choices.presentation.oairecerif.fundingParent = suggest
+authority.controlled.oairecerif.fundingParent = true
+
+choices.plugin.crisfund.investigators = AuthorAuthority
+choices.presentation.crisfund.investigators = suggest
+authority.controlled.crisfund.investigators = true
+
+choices.plugin.crisfund.coinvestigators = AuthorAuthority
+choices.presentation.crisfund.coinvestigators = suggest
+authority.controlled.crisfund.coinvestigators = true
+
+choices.plugin.crisfund.leadorganizations = OrgUnitAuthority
+choices.presentation.crisfund.leadorganizations = suggest
+authority.controlled.crisfund.leadorganizations = true
+
+choices.plugin.crisfund.leadcoorganizations = OrgUnitAuthority
+choices.presentation.crisfund.leadcoorganizations = suggest
+authority.controlled.crisfund.leadcoorganizations = true
+
+### authorities required by cris features
+choices.plugin.cris.policy.eperson = EPersonAuthority
+choices.presentation.cris.policy.eperson = suggest
+authority.controlled.cris.policy.eperson = true
+
+choices.plugin.cris.policy.group = GroupAuthority
+choices.presentation.cris.policy.group = suggest
+authority.controlled.cris.policy.group = true
+
+choices.plugin.dspace.object.owner = EPersonAuthority
+choices.presentation.dspace.object.owner = suggest
+authority.controlled.dspace.object.owner = true
+
+choices.plugin.dc.identifier.issn = ZDBAuthority
+choices.presentation.dc.identifier.issn = suggest
+authority.controlled.dc.identifier.issn = true
+
+choices.plugin.dc.relation.ispartof = SherpaAuthority
+choices.presentation.dc.relation.ispartof = suggest
+authority.controlled.dc.relation.ispartof = true
+
+authority.controlled.dc.type = true
+choices.plugin.dc.type = ControlledVocabularyAuthority
+
+# DSpace-CRIS stores by default the authority of controlled vocabularies
+vocabulary.plugin.authority.store = true
diff --git a/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml b/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml
index fe47289e4315..15c3574951d9 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml
@@ -2073,6 +2073,293 @@ it, please enter the types and the actual numbers or codes.</hint>
         </row>
     </form>
 
+    <form name="green">
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>identifier</dc-element>
+          <repeatable>true</repeatable>
+          <label>Identifiers</label>
+          <input-type value-pairs-name="common_identifiers">qualdrop_value</input-type>
+          <hint>If the item has any identification numbers or codes associated with
+            it, please enter the types and the actual numbers or codes.
+          </hint>
+          <required/>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>title</dc-element>
+          <repeatable>false</repeatable>
+          <label>Title</label>
+          <input-type>onebox</input-type>
+          <hint>Enter the main title of the item.</hint>
+          <required>You must enter a main title for this item.</required>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>title</dc-element>
+          <dc-qualifier>alternative</dc-qualifier>
+          <repeatable>true</repeatable>
+          <label>Other Titles</label>
+          <input-type>onebox</input-type>
+          <hint>If the item has any alternative titles, please enter them here.</hint>
+          <required/>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>date</dc-element>
+          <dc-qualifier>issued</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Date of Issue</label>
+          <input-type>date</input-type>
+          <hint>Please give the date of previous publication or public distribution.
+            You can leave out the day and/or month if they aren't
+            applicable.
+          </hint>
+          <required>You must enter at least the year.</required>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>contributor</dc-element>
+          <dc-qualifier>author</dc-qualifier>
+          <repeatable>true</repeatable>
+          <label>Authors</label>
+          <input-type>group</input-type>
+          <hint>Enter the names of the authors of this item.</hint>
+          <required/>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>contributor</dc-element>
+          <dc-qualifier>group</dc-qualifier>
+          <repeatable>true</repeatable>
+          <label>Editors</label>
+          <input-type>onebox</input-type>
+          <hint>The editors of this publication.</hint>
+          <required/>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>type</dc-element>
+          <repeatable>false</repeatable>
+          <label>Type</label>
+          <input-type>onebox</input-type>
+          <hint>Select the type(s) of content of the item.</hint>
+          <required>You must select a publication type</required>
+          <vocabulary>publication-coar-types</vocabulary>
+        </field>
+      </row>
+    </form>
+    <form name="green-dc-contributor-author">
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>contributor</dc-element>
+          <dc-qualifier>author</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Author</label>
+          <input-type>onebox</input-type>
+          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh
+            or Smith, J].
+          </hint>
+          <required>You must enter at least the author.</required>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>oairecerif</dc-schema>
+          <dc-element>author</dc-element>
+          <dc-qualifier>affiliation</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Affiliation</label>
+          <input-type>onebox</input-type>
+          <hint>Enter the affiliation of the author as stated on the publication.</hint>
+          <required/>
+        </field>
+      </row>
+    </form>
+    <form name="green-dc-contributor-editor">
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>contributor</dc-element>
+          <dc-qualifier>editor</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Editor</label>
+          <input-type>onebox</input-type>
+          <hint>The editors of this publication.</hint>
+          <required>You must enter at least the author.</required>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>oairecerif</dc-schema>
+          <dc-element>editor</dc-element>
+          <dc-qualifier>affiliation</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Affiliation</label>
+          <input-type>onebox</input-type>
+          <hint>Enter the affiliation of the editor as stated on the publication.</hint>
+          <required/>
+        </field>
+      </row>
+    </form>
+
+    <form name="orange">
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>identifier</dc-element>
+          <repeatable>true</repeatable>
+          <label>Identifiers</label>
+          <input-type value-pairs-name="common_identifiers">qualdrop_value</input-type>
+          <hint>If the item has any identification numbers or codes associated with
+            it, please enter the types and the actual numbers or codes.
+          </hint>
+          <required/>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>title</dc-element>
+          <repeatable>false</repeatable>
+          <label>Title</label>
+          <input-type>onebox</input-type>
+          <hint>Enter the main title of the item.</hint>
+          <required>You must enter a main title for this item.</required>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>title</dc-element>
+          <dc-qualifier>alternative</dc-qualifier>
+          <repeatable>true</repeatable>
+          <label>Other Titles</label>
+          <input-type>onebox</input-type>
+          <hint>If the item has any alternative titles, please enter them here.</hint>
+          <required/>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>date</dc-element>
+          <dc-qualifier>issued</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Date of Issue</label>
+          <input-type>date</input-type>
+          <hint>Please give the date of previous publication or public distribution.
+            You can leave out the day and/or month if they aren't
+            applicable.
+          </hint>
+          <required>You must enter at least the year.</required>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>contributor</dc-element>
+          <dc-qualifier>author</dc-qualifier>
+          <repeatable>true</repeatable>
+          <label>Authors</label>
+          <input-type>group</input-type>
+          <hint>Enter the names of the authors of this item.</hint>
+          <required/>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>contributor</dc-element>
+          <dc-qualifier>group</dc-qualifier>
+          <repeatable>true</repeatable>
+          <label>Editors</label>
+          <input-type>onebox</input-type>
+          <hint>The editors of this publication.</hint>
+          <required/>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>type</dc-element>
+          <repeatable>false</repeatable>
+          <label>Type</label>
+          <input-type>onebox</input-type>
+          <hint>Select the type(s) of content of the item.</hint>
+          <required>You must select a publication type</required>
+          <vocabulary>publication-coar-types</vocabulary>
+        </field>
+      </row>
+    </form>
+    <form name="orange-dc-contributor-author">
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>contributor</dc-element>
+          <dc-qualifier>author</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Author</label>
+          <input-type>onebox</input-type>
+          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh or Smith,
+            J].
+          </hint>
+          <required>You must enter at least the author.</required>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>oairecerif</dc-schema>
+          <dc-element>author</dc-element>
+          <dc-qualifier>affiliation</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Affiliation</label>
+          <input-type>onebox</input-type>
+          <hint>Enter the affiliation of the author as stated on the publication.</hint>
+          <required/>
+        </field>
+      </row>
+    </form>
+    <form name="orange-dc-contributor-editor">
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>contributor</dc-element>
+          <dc-qualifier>editor</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Editor</label>
+          <input-type>onebox</input-type>
+          <hint>The editors of this publication.</hint>
+          <required>You must enter at least the author.</required>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>oairecerif</dc-schema>
+          <dc-element>editor</dc-element>
+          <dc-qualifier>affiliation</dc-qualifier>
+          <repeatable>false</repeatable>
+          <label>Affiliation</label>
+          <input-type>onebox</input-type>
+          <hint>Enter the affiliation of the editor as stated on the publication.</hint>
+          <required/>
+        </field>
+      </row>
+    </form>
  </form-definitions>
 
 
diff --git a/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
index 60122ba5dbde..a28c968eb992 100644
--- a/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
@@ -298,7 +298,7 @@ public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreation() {
         assertThat(organization.getDisambiguatedOrganization().getDisambiguatedOrganizationIdentifier(), is("12345"));
         assertThat(organization.getDisambiguatedOrganization().getDisambiguationSource(), is("RINGGOLD"));
     }
-    
+
     @Test
     public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithAncestor() {
 
@@ -310,14 +310,13 @@ public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithAncest
                                   .withOrgUnitLocality("Milan")
                                   .withOrgUnitRinggoldIdentifier("12345")
                                   .build();
-        
+
         Item orgUnitFather = ItemBuilder.createItem(context, orgUnits)
                 .withTitle("4Science without rin")
                 .withOrgUnitCountry("IT")
                 .withOrgUnitLocality("Milan")
                 .withParentOrganization("4Science with rin", orgUnitGranfather.getID().toString())
                 .build();
-        
 
         Item orgUnit = ItemBuilder.createItem(context, orgUnits)
                                   .withTitle("4Science")
@@ -363,7 +362,7 @@ public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithAncest
         assertThat(organization.getDisambiguatedOrganization().getDisambiguatedOrganizationIdentifier(), is("12345"));
         assertThat(organization.getDisambiguatedOrganization().getDisambiguationSource(), is("RINGGOLD"));
     }
-    
+
     @Test
     public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithNoId() {
 
@@ -417,8 +416,6 @@ public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithNoId()
         assertThat(organization.getAddress().getCity(), is("Milan"));
         assertThat(organization.getDisambiguatedOrganization(), nullValue());
     }
-    
-    
 
     @Test
     public void testQualificationCreation() {
diff --git a/dspace-server-webapp/src/test/data/dspaceFolder/config/item-submission.xml b/dspace-server-webapp/src/test/data/dspaceFolder/config/item-submission.xml
index eca9acf79fd7..8956710a3e3a 100644
--- a/dspace-server-webapp/src/test/data/dspaceFolder/config/item-submission.xml
+++ b/dspace-server-webapp/src/test/data/dspaceFolder/config/item-submission.xml
@@ -7,285 +7,286 @@
 <!-- and number of the steps that occur in the Item Submission Process. -->
 <item-submission>
 
-    <!-- The process-map maps collection handles to a particular Item -->
-    <!-- Submission Process. This requires that a collection's name be -->
-    <!-- unique, even within a community. DSpace does however ensure that each -->
-    <!-- collection's handle is unique. Process-map provides the means to -->
-    <!-- associate a unique collection name with an Item Submission process. -->
-    <!-- The process-map also provides the special handle "default" (which is -->
-    <!-- never a collection), here mapped to "traditional". Any collection -->
-    <!-- which does not appear in this map will be associated with the mapping -->
-    <!-- for handle "default". -->
-    <submission-map>
-        <name-map collection-handle="default" submission-name="traditional"/>
-    </submission-map>
-
-
-
-    <!-- The 'step-definitions' allows you to define steps which you may wish -->
-    <!-- to "share" amongst multiple submission-item definitions. In order to -->
-    <!-- share the same step definition, you can refer to it by its unique id -->
-    <!-- defined in this section. EVERY 'step' in this section MUST have a -->
-    <!-- unique identifier in the 'id' attribute! -->
-    <!-- -->
-    <!-- Each <step-definition> REQUIRES the following attributes (@) and properties: -->
-    <!-- @id - The unique identifier for this step -->
-    <!-- -->
-    <!-- <processing-class> - The class which will process all information for -->
-    <!-- this step. The class must extend -->
-    <!-- 'org.dspace.app.rest.submit.AbstractProcessingStep' -->
-    <!-- (or one of the org.dspace.submit.step.* classes) -->
-    <!-- This property should reference the full path of the class -->
-    <!-- (e.g. org.dspace.submit.step.MyCustomStep) -->
-    <!-- -->
-    <!-- The following properties are OPTIONAL for each <step-definition>: -->
-    <!-- <heading> - References the message key, from the -->
-    <!-- Messages.properties -->
-    <!-- -->
-    <step-definitions>
-        <!-- The "collection" step is a "special step" which is *REQUIRED* -->
-        <!-- In DSpace, all submitted items must be immediately assigned --> 
-        <!-- to a collection. This step ensures that a collection is always selected. -->
-        <step-definition id="collection">
-            <heading></heading>
-            <processing-class>org.dspace.app.rest.submit.step.CollectionStep</processing-class>
-            <type>collection</type>
-            <scope visibility="hidden" visibilityOutside="hidden">submission</scope>
-        </step-definition>
-        <step-definition id="traditionalpageone" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="traditionalpagetwo" mandatory="true">
-            <heading>submit.progressbar.describe.steptwo</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-
-        <step-definition id="peopleStep" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="projectStep" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="orgUnitStep" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="journalStep" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="journalVolumeStep" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="journalIssueStep" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-
-        <step-definition id="upload">
-            <heading>submit.progressbar.upload</heading>
-            <processing-class>org.dspace.app.rest.submit.step.UploadStep</processing-class>
-            <type>upload</type>
-        </step-definition>
-        <step-definition id="license">
-            <heading>submit.progressbar.license</heading>
-            <processing-class>org.dspace.app.rest.submit.step.LicenseStep</processing-class>
-            <type>license</type>
-            <scope visibilityOutside="read-only">submission</scope>
-        </step-definition>
-
-        <!-- Step Upload Item with Embargo Features to enable this step, please 
-            make sure to comment-out the previous step "UploadStep" <step-definition id="upload-with-embargo">
-            <heading>submit.progressbar.upload</heading> <processing-class>org.dspace.submit.step.UploadWithEmbargoStep</processing-class> 
-            <type>uploadWithEmbargo</type> </step-definition> -->
-
-
-        <!--Step will be to select a Creative Commons License -->
-        <!-- Uncomment this step to allow the user to select a Creative Commons 
-            license -->
-         <step-definition id="cclicense"> <heading>submit.progressbar.CClicense</heading>
-            <processing-class>org.dspace.app.rest.submit.step.CCLicenseStep</processing-class>
-	       <type>cclicense</type> </step-definition>
-
-        <!--Step will be to Check for potential duplicate -->
-        <!-- <step-definition id="detect-duplicate"> <heading>submit.progressbar.detect.duplicate</heading>
-            <processing-class>org.dspace.submit.step.DetectPotentialDuplicate</processing-class> 
-            <type>duplicate</type> </step-definition> -->
-
-        <!--Step will be to Verify/Review everything -->
-        <!-- <step-definition id="verify"> <heading>submit.progressbar.verify</heading> <processing-class>org.dspace.submit.step.VerifyStep</processing-class>
-            <type>verify</type> </step-definition> -->
-
-        <!-- Fake Steps to test parsing of all options -->
-        <!-- <step-definition mandatory="false"> <heading>fake.submission.readonly</heading>
-            <processing-class>org.dspace.submit.step.SampleStep</processing-class> <type>sample</type> 
-            <scope visibility="read-only">submission</scope> </step-definition> <step-definition mandatory="false">
-            <heading>fake.workflow.readonly</heading> <processing-class>org.dspace.submit.step.SampleStep</processing-class> 
-            <type>sample</type> <scope visibility="read-only">workflow</scope> </step-definition> -->
-
-        <!-- OpenAIRE submission steps/forms -->
-        <step-definition id="openAIREProjectForm" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="openAIREPersonForm" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="openAIREOrganizationForm" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="openAIREPublicationPageoneForm" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="openAIREPublicationPagetwoForm" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-
-        <!-- New step for show / mint identifiers -->
-        <step-definition id="identifiers">
-            <heading>submit.progressbar.identifiers</heading>
-            <processing-class>org.dspace.app.rest.submit.step.ShowIdentifiersStep</processing-class>
-            <type>identifiers</type>
-        </step-definition>
-
-        <!-- This is the Sample Step which utilizes the JSPSampleStep class -->
-        <step-definition id="sample">
-            <heading>Sample</heading>
-            <processing-class>org.dspace.submit.step.SampleStep</processing-class>
-            <type>sample</type>
-        </step-definition>
-    </step-definitions>
-
-    <!-- The submission-definitions map lays out the detailed definition of -->
-    <!-- all the Item Submission Processes (and the ordering of their steps). -->
-    <!-- Each separate "submission-process" has a unique name as an attribute, -->
-    <!-- which matches one of the names in the process-map. One named -->
-    <!-- "submit-process" has the name "traditional"; as this name suggests, -->
-    <!-- it is the default item submission process, which gets used when -->
-    <!-- the specified collection has no correspondingly named submit-process. -->
-    <!-- -->
-    <!-- Each submit-process contains an ordered set of steps; each step -->
-    <!-- defines one "step" occurring during the process of submitting an -->
-    <!-- item. A step MUST be referenced by 'id' (it must -->
-    <!-- be defined in <step-definitions> above). -->
-    <!-- -->
-    <!-- -->
-    <submission-definitions>
-
-        <!--This "traditional" process defines the DEFAULT item submission process -->
-        <submission-process name="traditional">
-
-            <!--Uncommment to display the SAMPLE step as your first step -->
-            <!--<step id="sample"/> -->
-
-            <step id="collection"/>
-
-            <step id="identifiers"/>
-
-            <!--Step will be to Describe the item. -->
-            <step id="traditionalpageone"/>
-            <step id="traditionalpagetwo"/>
-
-            <!--Step will be to Upload the item -->
-            <step id="upload"/>
-            <!-- <step id="upload-with-embargo"/> -->
-            <!-- <step id="detect-duplicate"/> -->
-
-            <step id="cclicense"/>
-
-            <!--Step will be to Sign off on the License -->
-            <step id="license"/>
-            <!-- <step id="creative-commons"/> -->
-            <!-- <step id="verify"/> -->
-        </submission-process>
-
-        <submission-process name="People">
-            <step id="collection"/>
-            <step id="peopleStep"/>
-            <step id="upload"/>
-            <step id="license"/>
-        </submission-process>
-
-        <submission-process name="Project">
-            <step id="collection"/>
-            <step id="projectStep"/>
-            <step id="upload"/>
-            <step id="license"/>
-        </submission-process>
-
-        <submission-process name="OrgUnit">
-            <step id="collection"/>
-            <step id="orgUnitStep"/>
-            <step id="upload"/>
-            <step id="license"/>
-        </submission-process>
-        <submission-process name="Journals">
-            <step id="collection"/>
-            <step id="journalStep"/>
-            <step id="upload"/>
-            <step id="license"/>
-        </submission-process>
-        <submission-process name="JournalVolumes">
-            <step id="collection"/>
-            <step id="journalVolumeStep"/>
-            <step id="upload"/>
-            <step id="license"/>
-        </submission-process>
-        <submission-process name="JournalIssues">
-            <step id="collection"/>
-            <step id="journalIssueStep"/>
-            <step id="upload"/>
-            <step id="license"/>
-        </submission-process>
-
-        <!-- OpenAIRE submission processes -->
-        <submission-process name="openAIREPublicationSubmission">
-            <step id="collection"/>
-
-            <!--Step will be to Describe the item. -->
-            <step id="openAIREPublicationPageoneForm"/>
-            <step id="openAIREPublicationPagetwoForm"/>
-
-            <!--Step will be to Upload the item -->
-            <!-- step id="upload-with-embargo"/-->
-            <step id="upload"/>
-
-            <!--Step will be to Sign off on the License -->
-            <step id="license"/>
-        </submission-process>
-        <submission-process name="openAIREPersonSubmission">
-            <step id="collection"/>
-            <step id="openAIREPersonForm"/>
-        </submission-process>
-        <submission-process name="openAIREProjectSubmission">
-            <step id="collection"/>
-            <step id="openAIREProjectForm"/>
-        </submission-process>
-        <submission-process name="openAIREOrganizationSubmission">
-            <step id="collection"/>
-            <step id="openAIREOrganizationForm"/>
-        </submission-process>
-    </submission-definitions>
+  <!-- The process-map maps collection handles to a particular Item -->
+  <!-- Submission Process. This requires that a collection's name be -->
+  <!-- unique, even within a community. DSpace does however ensure that each -->
+  <!-- collection's handle is unique. Process-map provides the means to -->
+  <!-- associate a unique collection name with an Item Submission process. -->
+  <!-- The process-map also provides the special handle "default" (which is -->
+  <!-- never a collection), here mapped to "traditional". Any collection -->
+  <!-- which does not appear in this map will be associated with the mapping -->
+  <!-- for handle "default". -->
+  <submission-map>
+    <name-map collection-handle="default" submission-name="traditional"/>
+  </submission-map>
+
+
+  <!-- The 'step-definitions' allows you to define steps which you may wish -->
+  <!-- to "share" amongst multiple submission-item definitions. In order to -->
+  <!-- share the same step definition, you can refer to it by its unique id -->
+  <!-- defined in this section. EVERY 'step' in this section MUST have a -->
+  <!-- unique identifier in the 'id' attribute! -->
+  <!-- -->
+  <!-- Each <step-definition> REQUIRES the following attributes (@) and properties: -->
+  <!-- @id - The unique identifier for this step -->
+  <!-- -->
+  <!-- <processing-class> - The class which will process all information for -->
+  <!-- this step. The class must extend -->
+  <!-- 'org.dspace.app.rest.submit.AbstractProcessingStep' -->
+  <!-- (or one of the org.dspace.submit.step.* classes) -->
+  <!-- This property should reference the full path of the class -->
+  <!-- (e.g. org.dspace.submit.step.MyCustomStep) -->
+  <!-- -->
+  <!-- The following properties are OPTIONAL for each <step-definition>: -->
+  <!-- <heading> - References the message key, from the -->
+  <!-- Messages.properties -->
+  <!-- -->
+  <step-definitions>
+    <!-- The "collection" step is a "special step" which is *REQUIRED* -->
+    <!-- In DSpace, all submitted items must be immediately assigned -->
+    <!-- to a collection. This step ensures that a collection is always selected. -->
+    <step-definition id="collection">
+      <heading></heading>
+      <processing-class>org.dspace.app.rest.submit.step.CollectionStep</processing-class>
+      <type>collection</type>
+      <scope visibility="hidden" visibilityOutside="hidden">submission</scope>
+    </step-definition>
+    <step-definition id="traditionalpageone" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="traditionalpagetwo" mandatory="true">
+      <heading>submit.progressbar.describe.steptwo</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+
+    <step-definition id="peopleStep" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="projectStep" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="orgUnitStep" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="journalStep" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="journalVolumeStep" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="journalIssueStep" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+
+    <step-definition id="upload">
+      <heading>submit.progressbar.upload</heading>
+      <processing-class>org.dspace.app.rest.submit.step.UploadStep</processing-class>
+      <type>upload</type>
+    </step-definition>
+    <step-definition id="license">
+      <heading>submit.progressbar.license</heading>
+      <processing-class>org.dspace.app.rest.submit.step.LicenseStep</processing-class>
+      <type>license</type>
+      <scope visibilityOutside="read-only">submission</scope>
+    </step-definition>
+
+    <!-- Step Upload Item with Embargo Features to enable this step, please
+        make sure to comment-out the previous step "UploadStep" <step-definition id="upload-with-embargo">
+        <heading>submit.progressbar.upload</heading> <processing-class>org.dspace.submit.step.UploadWithEmbargoStep</processing-class>
+        <type>uploadWithEmbargo</type> </step-definition> -->
+
+
+    <!--Step will be to select a Creative Commons License -->
+    <!-- Uncomment this step to allow the user to select a Creative Commons
+        license -->
+    <step-definition id="cclicense">
+      <heading>submit.progressbar.CClicense</heading>
+      <processing-class>org.dspace.app.rest.submit.step.CCLicenseStep</processing-class>
+      <type>cclicense</type>
+    </step-definition>
+
+    <!--Step will be to Check for potential duplicate -->
+    <!-- <step-definition id="detect-duplicate"> <heading>submit.progressbar.detect.duplicate</heading>
+        <processing-class>org.dspace.submit.step.DetectPotentialDuplicate</processing-class>
+        <type>duplicate</type> </step-definition> -->
+
+    <!--Step will be to Verify/Review everything -->
+    <!-- <step-definition id="verify"> <heading>submit.progressbar.verify</heading> <processing-class>org.dspace.submit.step.VerifyStep</processing-class>
+        <type>verify</type> </step-definition> -->
+
+    <!-- Fake Steps to test parsing of all options -->
+    <!-- <step-definition mandatory="false"> <heading>fake.submission.readonly</heading>
+        <processing-class>org.dspace.submit.step.SampleStep</processing-class> <type>sample</type>
+        <scope visibility="read-only">submission</scope> </step-definition> <step-definition mandatory="false">
+        <heading>fake.workflow.readonly</heading> <processing-class>org.dspace.submit.step.SampleStep</processing-class>
+        <type>sample</type> <scope visibility="read-only">workflow</scope> </step-definition> -->
+
+    <!-- OpenAIRE submission steps/forms -->
+    <step-definition id="openAIREProjectForm" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="openAIREPersonForm" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="openAIREOrganizationForm" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="openAIREPublicationPageoneForm" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+    <step-definition id="openAIREPublicationPagetwoForm" mandatory="true">
+      <heading>submit.progressbar.describe.stepone</heading>
+      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+      <type>submission-form</type>
+    </step-definition>
+
+    <!-- New step for show / mint identifiers -->
+    <step-definition id="identifiers">
+      <heading>submit.progressbar.identifiers</heading>
+      <processing-class>org.dspace.app.rest.submit.step.ShowIdentifiersStep</processing-class>
+      <type>identifiers</type>
+    </step-definition>
+
+    <!-- This is the Sample Step which utilizes the JSPSampleStep class -->
+    <step-definition id="sample">
+      <heading>Sample</heading>
+      <processing-class>org.dspace.submit.step.SampleStep</processing-class>
+      <type>sample</type>
+    </step-definition>
+  </step-definitions>
+
+  <!-- The submission-definitions map lays out the detailed definition of -->
+  <!-- all the Item Submission Processes (and the ordering of their steps). -->
+  <!-- Each separate "submission-process" has a unique name as an attribute, -->
+  <!-- which matches one of the names in the process-map. One named -->
+  <!-- "submit-process" has the name "traditional"; as this name suggests, -->
+  <!-- it is the default item submission process, which gets used when -->
+  <!-- the specified collection has no correspondingly named submit-process. -->
+  <!-- -->
+  <!-- Each submit-process contains an ordered set of steps; each step -->
+  <!-- defines one "step" occurring during the process of submitting an -->
+  <!-- item. A step MUST be referenced by 'id' (it must -->
+  <!-- be defined in <step-definitions> above). -->
+  <!-- -->
+  <!-- -->
+  <submission-definitions>
+
+    <!--This "traditional" process defines the DEFAULT item submission process -->
+    <submission-process name="traditional">
+
+      <!--Uncommment to display the SAMPLE step as your first step -->
+      <!--<step id="sample"/> -->
+
+      <step id="collection"/>
+
+      <step id="identifiers"/>
+
+      <!--Step will be to Describe the item. -->
+      <step id="traditionalpageone"/>
+      <step id="traditionalpagetwo"/>
+
+      <!--Step will be to Upload the item -->
+      <step id="upload"/>
+      <!-- <step id="upload-with-embargo"/> -->
+      <!-- <step id="detect-duplicate"/> -->
+
+      <step id="cclicense"/>
+
+      <!--Step will be to Sign off on the License -->
+      <step id="license"/>
+      <!-- <step id="creative-commons"/> -->
+      <!-- <step id="verify"/> -->
+    </submission-process>
+
+    <submission-process name="People">
+      <step id="collection"/>
+      <step id="peopleStep"/>
+      <step id="upload"/>
+      <step id="license"/>
+    </submission-process>
+
+    <submission-process name="Project">
+      <step id="collection"/>
+      <step id="projectStep"/>
+      <step id="upload"/>
+      <step id="license"/>
+    </submission-process>
+
+    <submission-process name="OrgUnit">
+      <step id="collection"/>
+      <step id="orgUnitStep"/>
+      <step id="upload"/>
+      <step id="license"/>
+    </submission-process>
+    <submission-process name="Journals">
+      <step id="collection"/>
+      <step id="journalStep"/>
+      <step id="upload"/>
+      <step id="license"/>
+    </submission-process>
+    <submission-process name="JournalVolumes">
+      <step id="collection"/>
+      <step id="journalVolumeStep"/>
+      <step id="upload"/>
+      <step id="license"/>
+    </submission-process>
+    <submission-process name="JournalIssues">
+      <step id="collection"/>
+      <step id="journalIssueStep"/>
+      <step id="upload"/>
+      <step id="license"/>
+    </submission-process>
+
+    <!-- OpenAIRE submission processes -->
+    <submission-process name="openAIREPublicationSubmission">
+      <step id="collection"/>
+
+      <!--Step will be to Describe the item. -->
+      <step id="openAIREPublicationPageoneForm"/>
+      <step id="openAIREPublicationPagetwoForm"/>
+
+      <!--Step will be to Upload the item -->
+      <!-- step id="upload-with-embargo"/-->
+      <step id="upload"/>
+
+      <!--Step will be to Sign off on the License -->
+      <step id="license"/>
+    </submission-process>
+    <submission-process name="openAIREPersonSubmission">
+      <step id="collection"/>
+      <step id="openAIREPersonForm"/>
+    </submission-process>
+    <submission-process name="openAIREProjectSubmission">
+      <step id="collection"/>
+      <step id="openAIREProjectForm"/>
+    </submission-process>
+    <submission-process name="openAIREOrganizationSubmission">
+      <step id="collection"/>
+      <step id="openAIREOrganizationForm"/>
+    </submission-process>
+  </submission-definitions>
 
 </item-submission>
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java
index 9af95845d407..269de3aefb9d 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java
@@ -321,10 +321,10 @@ public void findAllPaginationTest() throws Exception {
                         Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                         Matchers.containsString("/api/config/submissiondefinitions?"),
-                        Matchers.containsString("page=16"), Matchers.containsString("size=1"))))
+                        Matchers.containsString("page=18"), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$.page.size", is(1)))
-                .andExpect(jsonPath("$.page.totalElements", is(17)))
-                .andExpect(jsonPath("$.page.totalPages", is(17)))
+                .andExpect(jsonPath("$.page.totalElements", is(19)))
+                .andExpect(jsonPath("$.page.totalPages", is(19)))
                 .andExpect(jsonPath("$.page.number", is(0)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
@@ -347,10 +347,10 @@ public void findAllPaginationTest() throws Exception {
                         Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                         Matchers.containsString("/api/config/submissiondefinitions?"),
-                        Matchers.containsString("page=16"), Matchers.containsString("size=1"))))
+                        Matchers.containsString("page=18"), Matchers.containsString("size=1"))))
                 .andExpect(jsonPath("$.page.size", is(1)))
-                .andExpect(jsonPath("$.page.totalElements", is(17)))
-                .andExpect(jsonPath("$.page.totalPages", is(17)))
+                .andExpect(jsonPath("$.page.totalElements", is(19)))
+                .andExpect(jsonPath("$.page.totalPages", is(19)))
                 .andExpect(jsonPath("$.page.number", is(1)));
     }
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java
index 27a7ccb0985d..d817b573ff2b 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java
@@ -73,7 +73,7 @@ public void findAll() throws Exception {
                    .andExpect(content().contentType(contentType))
                    //The configuration file for the test env includes PAGE_TOTAL_ELEMENTS forms
                    .andExpect(jsonPath("$.page.size", is(20)))
-                   .andExpect(jsonPath("$.page.totalElements", equalTo(34)))
+                   .andExpect(jsonPath("$.page.totalElements", equalTo(40)))
                    .andExpect(jsonPath("$.page.totalPages", equalTo(2)))
                    .andExpect(jsonPath("$.page.number", is(0)))
                    .andExpect(
@@ -90,7 +90,7 @@ public void findAllWithNewlyCreatedAccountTest() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(contentType))
                 .andExpect(jsonPath("$.page.size", is(20)))
-                .andExpect(jsonPath("$.page.totalElements", equalTo(34)))
+                .andExpect(jsonPath("$.page.totalElements", equalTo(40)))
                 .andExpect(jsonPath("$.page.totalPages", equalTo(2)))
                 .andExpect(jsonPath("$.page.number", is(0)))
                 .andExpect(jsonPath("$._links.self.href", Matchers.startsWith(REST_SERVER_URL
@@ -670,10 +670,10 @@ public void findAllPaginationTest() throws Exception {
                          Matchers.containsString("page=1"), Matchers.containsString("size=2"))))
                  .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                          Matchers.containsString("/api/config/submissionforms?"),
-                         Matchers.containsString("page=16"), Matchers.containsString("size=2"))))
+                         Matchers.containsString("page=19"), Matchers.containsString("size=2"))))
                  .andExpect(jsonPath("$.page.size", is(2)))
-                 .andExpect(jsonPath("$.page.totalElements", equalTo(34)))
-                 .andExpect(jsonPath("$.page.totalPages", equalTo(17)))
+                 .andExpect(jsonPath("$.page.totalElements", equalTo(40)))
+                 .andExpect(jsonPath("$.page.totalPages", equalTo(20)))
                  .andExpect(jsonPath("$.page.number", is(0)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissionforms")
@@ -681,8 +681,8 @@ public void findAllPaginationTest() throws Exception {
                  .param("page", "15"))
                  .andExpect(status().isOk())
                  .andExpect(content().contentType(contentType))
-                 .andExpect(jsonPath("$._embedded.submissionforms[0].id", is("publication_indexing")))
-                 .andExpect(jsonPath("$._embedded.submissionforms[1].id", is("qualdroptest")))
+                 .andExpect(jsonPath("$._embedded.submissionforms[0].id", is("publication-dc-contributor-author")))
+                 .andExpect(jsonPath("$._embedded.submissionforms[1].id", is("publication-dc-contributor-editor")))
                  .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
                          Matchers.containsString("/api/config/submissionforms?"),
                          Matchers.containsString("page=0"), Matchers.containsString("size=2"))))
@@ -697,10 +697,10 @@ public void findAllPaginationTest() throws Exception {
                          Matchers.containsString("page=16"), Matchers.containsString("size=2"))))
                  .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                          Matchers.containsString("/api/config/submissionforms?"),
-                         Matchers.containsString("page=16"), Matchers.containsString("size=2"))))
+                         Matchers.containsString("page=19"), Matchers.containsString("size=2"))))
                  .andExpect(jsonPath("$.page.size", is(2)))
-                 .andExpect(jsonPath("$.page.totalElements", equalTo(34)))
-                 .andExpect(jsonPath("$.page.totalPages", equalTo(17)))
+                 .andExpect(jsonPath("$.page.totalElements", equalTo(40)))
+                 .andExpect(jsonPath("$.page.totalPages", equalTo(20)))
                  .andExpect(jsonPath("$.page.number", is(15)));
     }
 
@@ -744,10 +744,10 @@ public void visibilityTest() throws Exception {
                                  Matchers.containsString("page=4"), Matchers.containsString("size=2"))))
                              .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                                  Matchers.containsString("/api/config/submissionforms?"),
-                                 Matchers.containsString("page=16"), Matchers.containsString("size=2"))))
+                                 Matchers.containsString("page=19"), Matchers.containsString("size=2"))))
                              .andExpect(jsonPath("$.page.size", is(2)))
-                             .andExpect(jsonPath("$.page.totalElements", equalTo(34)))
-                             .andExpect(jsonPath("$.page.totalPages", equalTo(17)))
+                             .andExpect(jsonPath("$.page.totalElements", equalTo(40)))
+                             .andExpect(jsonPath("$.page.totalPages", equalTo(20)))
                              .andExpect(jsonPath("$.page.number", is(4)));
     }
 }
diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml
index d2d159775ad2..35c9ffdc8de4 100644
--- a/dspace/config/item-submission.xml
+++ b/dspace/config/item-submission.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE item-submission SYSTEM "item-submission.dtd">
-
 <item-submission>
 
   <!-- The process-map maps collection handles to a particular Item -->
@@ -155,16 +154,6 @@
       <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
       <type>submission-form</type>
     </step-definition>
-    <step-definition id="green" mandatory="true">
-      <heading>submit.progressbar.describe.green</heading>
-      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-      <type>submission-form</type>
-    </step-definition>
-    <step-definition id="orange" mandatory="true">
-      <heading>submit.progressbar.describe.green</heading>
-      <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-      <type>submission-form</type>
-    </step-definition>
     <step-definition id="owner" mandatory="true">
       <heading>submit.progressbar.describe.owner</heading>
       <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
@@ -182,8 +171,8 @@
       <type>cclicense</type>
     </step-definition>
     <!-- This optional step may allow the user to select access conditions on the item -->
-    <step-definition id="itemAccessConditions">
-      <heading>submit.progressbar.accessCondition</heading>
+    <step-definition id="itemAccessConditions" mandatory="true">
+      <heading>submit.progressbar.itemAccessConditions</heading>
       <processing-class>org.dspace.app.rest.submit.step.AccessConditionStep</processing-class>
       <type>accessCondition</type>
     </step-definition>
@@ -202,12 +191,12 @@
       <scope visibility="hidden" visibilityOutside="hidden">submission</scope>
     </step-definition>
     <step-definition id="custom-url" mandatory="false">
-      <heading>submit.progressbar.CustomUrlStep</heading>
+      <heading>submit.progressbar.custom-url</heading>
       <processing-class>org.dspace.app.rest.submit.step.CustomUrlStep</processing-class>
       <type>custom-url</type>
     </step-definition>
     <step-definition id="correction" mandatory="true">
-      <heading>submit.progressbar.correction-step</heading>
+      <heading>submit.progressbar.correction</heading>
       <processing-class>org.dspace.app.rest.submit.step.CorrectionStep</processing-class>
       <type>correction</type>
       <scope visibilityOutside="hidden">workflow</scope>
@@ -222,6 +211,7 @@
       <step id="correction" />
       <step id="detect-duplicate" />
       <step id="upload" />
+      <step id="cclicense" />
       <step id="license" />
     </submission-process>
     <submission-process name="product-edit">
@@ -360,16 +350,5 @@
       <step id="funding" />
       <step id="upload" />
     </submission-process>
-    <submission-process name="green">
-      <step id="extractionstep" />
-      <step id="green" />
-      <step id="upload" />
-    </submission-process>
-    <submission-process name="orange">
-      <step id="extractionstep" />
-      <step id="orange" />
-      <step id="upload" />
-    </submission-process>
   </submission-definitions>
 </item-submission>
-
diff --git a/dspace/config/modules/authority.cfg b/dspace/config/modules/authority.cfg
index 10e4bc36fbb9..99ccdbc025bb 100644
--- a/dspace/config/modules/authority.cfg
+++ b/dspace/config/modules/authority.cfg
@@ -136,8 +136,8 @@ choices.plugin.dc.contributor.author = AuthorAuthority
 choices.presentation.dc.contributor.author = suggest
 authority.controlled.dc.contributor.author = true
 
-choices.plugin.green.override.dc.contributor.author = AuthorStrictMatchAuthority
-choices.plugin.orange.override.dc.contributor.author = AuthorCoarseMatchAuthority
+#choices.plugin.green.override.dc.contributor.author = AuthorStrictMatchAuthority
+#choices.plugin.orange.override.dc.contributor.author = AuthorCoarseMatchAuthority
 
 choices.plugin.oairecerif.author.affiliation = OrgUnitAuthority
 choices.presentation.oairecerif.author.affiliation = suggest
diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
index c44ac175c1c7..86212e2f884c 100644
--- a/dspace/config/submission-forms.xml
+++ b/dspace/config/submission-forms.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE input-forms SYSTEM "submission-forms.dtd">
-
 <input-forms>
   <form-definitions>
     <form name="bitstream-metadata">
@@ -8,33 +7,33 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Enter the name of the file</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter a title for the file.</required>
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
-          <repeatable>false</repeatable>
           <label>Enter a description for the file</label>
           <input-type>textarea</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
           <label>File type</label>
           <input-type value-pairs-name="bitstream_types">dropdown</input-type>
-          <hint>Personal picture, logo, main article, etc.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Personal picture, logo, main article, etc.</hint>
         </field>
       </row>
       <row>
@@ -55,11 +54,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>contributor</dc-element>
           <dc-qualifier>author</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Author</label>
           <input-type>onebox</input-type>
-          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh or Smith, J].</hint>
+          <repeatable>false</repeatable>
           <required>You must enter at least the author.</required>
+          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh or Smith, J].</hint>
         </field>
       </row>
       <row>
@@ -67,11 +66,11 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>author</dc-element>
           <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Affiliation</label>
           <input-type>onebox</input-type>
-          <hint>Enter the affiliation of the author as stated on the publication.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Enter the affiliation of the author as stated on the publication.</hint>
         </field>
       </row>
     </form>
@@ -81,11 +80,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>contributor</dc-element>
           <dc-qualifier>editor</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Editor</label>
           <input-type>onebox</input-type>
-          <hint>The editors of this publication.</hint>
+          <repeatable>false</repeatable>
           <required>You must enter at least the author.</required>
+          <hint>The editors of this publication.</hint>
         </field>
       </row>
       <row>
@@ -93,11 +92,11 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>editor</dc-element>
           <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Affiliation</label>
           <input-type>onebox</input-type>
-          <hint>Enter the affiliation of the editor as stated on the publication.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Enter the affiliation of the editor as stated on the publication.</hint>
         </field>
       </row>
     </form>
@@ -107,11 +106,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>funding</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Funding</label>
           <input-type>onebox</input-type>
-          <hint>Enter the name of funding, if any, that has supported this publication</hint>
+          <repeatable>false</repeatable>
           <required>You must enter at least the funding name.</required>
+          <hint>Enter the name of funding, if any, that has supported this publication</hint>
         </field>
       </row>
       <row>
@@ -119,11 +118,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>grantno</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Grant Number / Funding identifier</label>
           <input-type>onebox</input-type>
-          <hint>If the funding is not found in the system please enter the funding identifier / grant no</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>If the funding is not found in the system please enter the funding identifier / grant no</hint>
         </field>
       </row>
     </form>
@@ -133,11 +132,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>funding</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Funding</label>
           <input-type>onebox</input-type>
-          <hint>Enter the name of funding, if any, that has supported this product</hint>
+          <repeatable>false</repeatable>
           <required>You must enter at least the funding name.</required>
+          <hint>Enter the name of funding, if any, that has supported this product</hint>
         </field>
       </row>
       <row>
@@ -145,11 +144,37 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>grantno</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Grant Number / Funding identifier</label>
           <input-type>onebox</input-type>
+          <repeatable>false</repeatable>
+          <required />
           <hint>If the funding is not found in the system please enter the funding identifier / grant no</hint>
+        </field>
+      </row>
+    </form>
+    <form name="product_references-dc-relation-publication">
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>relation</dc-element>
+          <dc-qualifier>publication</dc-qualifier>
+          <label>Publication</label>
+          <input-type>onebox</input-type>
+          <repeatable>false</repeatable>
+          <required>You must enter at least the publication title / citation</required>
+          <style>col-xs-12 col-md-9</style>
+          <hint>Enter the publication title or citation, if any, that uses this product</hint>
+        </field>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>relation</dc-element>
+          <dc-qualifier>doi</dc-qualifier>
+          <label>DOI</label>
+          <input-type>onebox</input-type>
+          <repeatable>false</repeatable>
           <required />
+          <style>col-xs-12 col-md-3</style>
+          <hint>If the publication is not found in the system please enter the DOI identifier</hint>
         </field>
       </row>
     </form>
@@ -159,11 +184,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>funding</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Funding</label>
           <input-type>onebox</input-type>
-          <hint>Enter the name of funding, if any, that has supported this patent</hint>
+          <repeatable>false</repeatable>
           <required>You must enter at least the funding name.</required>
+          <hint>Enter the name of funding, if any, that has supported this patent</hint>
         </field>
       </row>
       <row>
@@ -171,11 +196,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>grantno</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Grant Number / Funding identifier</label>
           <input-type>onebox</input-type>
-          <hint>If the funding is not found in the system please enter the funding identifier / grant no</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>If the funding is not found in the system please enter the funding identifier / grant no</hint>
         </field>
       </row>
     </form>
@@ -233,45 +258,45 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>affiliation</dc-element>
           <dc-qualifier>role</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Role</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>person</dc-element>
           <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Organisation name</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter at least the organisation of your affiliation.</required>
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>affiliation</dc-element>
           <dc-qualifier>startDate</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Start Date</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>affiliation</dc-element>
           <dc-qualifier>endDate</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>End Date</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
       </row>
     </form>
@@ -280,45 +305,45 @@
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>qualification</dc-element>
-          <repeatable>false</repeatable>
           <label>Organisation name</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter the organisation</required>
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>qualification</dc-element>
           <dc-qualifier>role</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Qualification Title</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter the qualification title.</required>
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>qualification</dc-element>
           <dc-qualifier>start</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Start Date</label>
-          <style>col-xs-12 col-md-3</style>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>qualification</dc-element>
           <dc-qualifier>end</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>End Date</label>
-          <style>col-xs-12 col-md-3</style>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
       </row>
     </form>
@@ -328,44 +353,44 @@
           <dc-schema>crisrp</dc-schema>
           <dc-element>education</dc-element>
           <dc-qualifier>role</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Degree/Title</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter the degree/title</required>
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>education</dc-element>
-          <repeatable>false</repeatable>
           <label>Organisation name</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter the organisation</required>
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>education</dc-element>
           <dc-qualifier>start</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Start Date</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>education</dc-element>
           <dc-qualifier>end</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>End Date</label>
-          <style>col-xs-12 col-md-6 col-lg-3</style>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <style>col-xs-12 col-md-6 col-lg-3</style>
+          <hint />
         </field>
       </row>
     </form>
@@ -375,11 +400,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>contributor</dc-element>
           <dc-qualifier>author</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Author</label>
-          <input-type>name</input-type>
-          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh or Smith, J].</hint>
+          <input-type>onebox</input-type>
+          <repeatable>false</repeatable>
           <required>You must enter at least the author.</required>
+          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh or Smith, J].</hint>
         </field>
       </row>
       <row>
@@ -387,11 +412,11 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>author</dc-element>
           <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Affiliation</label>
           <input-type>onebox</input-type>
-          <hint>Enter the affiliation of the author as stated on the publication.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Enter the affiliation of the author as stated on the publication.</hint>
         </field>
       </row>
     </form>
@@ -401,11 +426,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>contributor</dc-element>
           <dc-qualifier>author</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Author</label>
-          <input-type>name</input-type>
-          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh or Smith, J].</hint>
+          <input-type>onebox</input-type>
+          <repeatable>false</repeatable>
           <required>You must enter at least the inventor.</required>
+          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh or Smith, J].</hint>
         </field>
       </row>
       <row>
@@ -413,11 +438,11 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>author</dc-element>
           <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Affiliation</label>
           <input-type>onebox</input-type>
-          <hint>Enter the affiliation of the author as stated on the publication.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Enter the affiliation of the author as stated on the publication.</hint>
         </field>
       </row>
     </form>
@@ -427,11 +452,11 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>url</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Site URL</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter at least the site url.</required>
+          <hint />
         </field>
       </row>
       <row>
@@ -439,11 +464,11 @@
           <dc-schema>crisrp</dc-schema>
           <dc-element>site</dc-element>
           <dc-qualifier>title</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Site Title</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
     </form>
@@ -453,55 +478,55 @@
           <dc-schema>dc</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>issn</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>ISSN</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Title</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter a main title for this item.</required>
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>publisher</dc-element>
-          <repeatable>false</repeatable>
           <label>Publisher</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>subject</dc-element>
-          <repeatable>true</repeatable>
           <label>Subject Classifications</label>
           <input-type>tag</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
-          <repeatable>false</repeatable>
           <label>Description</label>
           <input-type>textarea</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
     </form>
@@ -510,23 +535,23 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>identifier</dc-element>
-          <repeatable>true</repeatable>
           <label>Identifiers</label>
           <input-type value-pairs-name="common_identifiers">qualdrop_value</input-type>
-          <hint>If the item has any identification numbers or codes associated with
-            it, please enter the types and the actual numbers or codes.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>If the item has any identification numbers or codes associated with
+it, please enter the types and the actual numbers or codes.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Title</label>
           <input-type>onebox</input-type>
-          <hint>Enter the main title of the item.</hint>
+          <repeatable>false</repeatable>
           <required>You must enter a main title for this item.</required>
+          <hint>Enter the main title of the item.</hint>
         </field>
       </row>
       <row>
@@ -534,11 +559,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
           <dc-qualifier>alternative</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Other Titles</label>
           <input-type>onebox</input-type>
-          <hint>If the item has any alternative titles, please enter them here.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>If the item has any alternative titles, please enter them here.</hint>
         </field>
       </row>
       <row>
@@ -546,13 +571,13 @@
           <dc-schema>dc</dc-schema>
           <dc-element>date</dc-element>
           <dc-qualifier>issued</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Date of Issue</label>
           <input-type>date</input-type>
-          <hint>Please give the date of previous publication or public distribution.
-            You can leave out the day and/or month if they aren't
-            applicable.</hint>
+          <repeatable>false</repeatable>
           <required>You must enter at least the year.</required>
+          <hint>Please give the date of previous publication or public distribution.
+                        You can leave out the day and/or month if they aren't
+                        applicable.</hint>
         </field>
       </row>
       <row>
@@ -560,11 +585,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>contributor</dc-element>
           <dc-qualifier>author</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Authors</label>
           <input-type>group</input-type>
-          <hint>Enter the names of the authors of this item.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter the names of the authors of this item.</hint>
         </field>
       </row>
       <row>
@@ -572,340 +597,61 @@
           <dc-schema>dc</dc-schema>
           <dc-element>contributor</dc-element>
           <dc-qualifier>editor</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Editors</label>
           <input-type>group</input-type>
-          <hint>The editors of this publication.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>The editors of this publication.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
           <label>Type</label>
           <input-type>onebox</input-type>
-          <hint>Select the type(s) of content of the item.</hint>
+          <repeatable>false</repeatable>
           <required>You must select a publication type</required>
+          <hint>Select the type(s) of content of the item.</hint>
           <vocabulary>publication-coar-types</vocabulary>
         </field>
       </row>
     </form>
-    <form name="green">
+    <form name="publication_indexing">
       <row>
         <field>
           <dc-schema>dc</dc-schema>
-          <dc-element>identifier</dc-element>
-          <repeatable>true</repeatable>
-          <label>Identifiers</label>
-          <input-type value-pairs-name="common_identifiers">qualdrop_value</input-type>
-          <hint>If the item has any identification numbers or codes associated with
-            it, please enter the types and the actual numbers or codes.</hint>
+          <dc-element>language</dc-element>
+          <dc-qualifier>iso</dc-qualifier>
+          <label>Language</label>
+          <input-type value-pairs-name="common_iso_languages">dropdown</input-type>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Select the language of the main content of the item. If the language does not appear in the list, please select 'Other'.  If the content does not really have a language (for example, if it is a dataset or an image) please select 'N/A'.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
-          <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
-          <label>Title</label>
-          <input-type>onebox</input-type>
-          <hint>Enter the main title of the item.</hint>
-          <required>You must enter a main title for this item.</required>
+          <dc-element>subject</dc-element>
+          <label>Subject Keywords</label>
+          <input-type>tag</input-type>
+          <repeatable>true</repeatable>
+          <required />
+          <hint>Enter appropriate subject keywords or phrases.</hint>
         </field>
       </row>
       <row>
         <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>title</dc-element>
-          <dc-qualifier>alternative</dc-qualifier>
-          <repeatable>true</repeatable>
-          <label>Other Titles</label>
+          <dc-schema>datacite</dc-schema>
+          <dc-element>subject</dc-element>
+          <dc-qualifier>fos</dc-qualifier>
+          <label>Fields of Science and Technology (OECD)</label>
           <input-type>onebox</input-type>
-          <hint>If the item has any alternative titles, please enter them here.</hint>
+          <repeatable>true</repeatable>
           <required />
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>date</dc-element>
-          <dc-qualifier>issued</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Date of Issue</label>
-          <input-type>date</input-type>
-          <hint>Please give the date of previous publication or public distribution.
-            You can leave out the day and/or month if they aren't
-            applicable.</hint>
-          <required>You must enter at least the year.</required>
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>contributor</dc-element>
-          <dc-qualifier>author</dc-qualifier>
-          <repeatable>true</repeatable>
-          <label>Authors</label>
-          <input-type>group</input-type>
-          <hint>Enter the names of the authors of this item.</hint>
-          <required />
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>contributor</dc-element>
-          <dc-qualifier>group</dc-qualifier>
-          <repeatable>true</repeatable>
-          <label>Editors</label>
-          <input-type>onebox</input-type>
-          <hint>The editors of this publication.</hint>
-          <required />
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
-          <label>Type</label>
-          <input-type>onebox</input-type>
-          <hint>Select the type(s) of content of the item.</hint>
-          <required>You must select a publication type</required>
-          <vocabulary>publication-coar-types</vocabulary>
-        </field>
-      </row>
-    </form>
-    <form name="green-dc-contributor-author">
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>contributor</dc-element>
-          <dc-qualifier>author</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Author</label>
-          <input-type>onebox</input-type>
-          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh or Smith, J].</hint>
-          <required>You must enter at least the author.</required>
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>oairecerif</dc-schema>
-          <dc-element>author</dc-element>
-          <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Affiliation</label>
-          <input-type>onebox</input-type>
-          <hint>Enter the affiliation of the author as stated on the publication.</hint>
-          <required />
-        </field>
-      </row>
-    </form>
-    <form name="green-dc-contributor-editor">
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>contributor</dc-element>
-          <dc-qualifier>editor</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Editor</label>
-          <input-type>onebox</input-type>
-          <hint>The editors of this publication.</hint>
-          <required>You must enter at least the author.</required>
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>oairecerif</dc-schema>
-          <dc-element>editor</dc-element>
-          <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Affiliation</label>
-          <input-type>onebox</input-type>
-          <hint>Enter the affiliation of the editor as stated on the publication.</hint>
-          <required />
-        </field>
-      </row>
-    </form>
-    <form name="orange">
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>identifier</dc-element>
-          <repeatable>true</repeatable>
-          <label>Identifiers</label>
-          <input-type value-pairs-name="common_identifiers">qualdrop_value</input-type>
-          <hint>If the item has any identification numbers or codes associated with
-            it, please enter the types and the actual numbers or codes.</hint>
-          <required />
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
-          <label>Title</label>
-          <input-type>onebox</input-type>
-          <hint>Enter the main title of the item.</hint>
-          <required>You must enter a main title for this item.</required>
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>title</dc-element>
-          <dc-qualifier>alternative</dc-qualifier>
-          <repeatable>true</repeatable>
-          <label>Other Titles</label>
-          <input-type>onebox</input-type>
-          <hint>If the item has any alternative titles, please enter them here.</hint>
-          <required />
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>date</dc-element>
-          <dc-qualifier>issued</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Date of Issue</label>
-          <input-type>date</input-type>
-          <hint>Please give the date of previous publication or public distribution.
-            You can leave out the day and/or month if they aren't
-            applicable.</hint>
-          <required>You must enter at least the year.</required>
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>contributor</dc-element>
-          <dc-qualifier>author</dc-qualifier>
-          <repeatable>true</repeatable>
-          <label>Authors</label>
-          <input-type>group</input-type>
-          <hint>Enter the names of the authors of this item.</hint>
-          <required />
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>contributor</dc-element>
-          <dc-qualifier>group</dc-qualifier>
-          <repeatable>true</repeatable>
-          <label>Editors</label>
-          <input-type>onebox</input-type>
-          <hint>The editors of this publication.</hint>
-          <required />
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
-          <label>Type</label>
-          <input-type>onebox</input-type>
-          <hint>Select the type(s) of content of the item.</hint>
-          <required>You must select a publication type</required>
-          <vocabulary>publication-coar-types</vocabulary>
-        </field>
-      </row>
-    </form>
-    <form name="orange-dc-contributor-author">
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>contributor</dc-element>
-          <dc-qualifier>author</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Author</label>
-          <input-type>onebox</input-type>
-          <hint>Enter the names of the authors of this item in the form Lastname, Firstname [i.e. Smith, Josh or Smith, J].</hint>
-          <required>You must enter at least the author.</required>
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>oairecerif</dc-schema>
-          <dc-element>author</dc-element>
-          <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Affiliation</label>
-          <input-type>onebox</input-type>
-          <hint>Enter the affiliation of the author as stated on the publication.</hint>
-          <required />
-        </field>
-      </row>
-    </form>
-    <form name="orange-dc-contributor-editor">
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>contributor</dc-element>
-          <dc-qualifier>editor</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Editor</label>
-          <input-type>onebox</input-type>
-          <hint>The editors of this publication.</hint>
-          <required>You must enter at least the author.</required>
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>oairecerif</dc-schema>
-          <dc-element>editor</dc-element>
-          <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Affiliation</label>
-          <input-type>onebox</input-type>
-          <hint>Enter the affiliation of the editor as stated on the publication.</hint>
-          <required />
-        </field>
-      </row>
-    </form>
-
-    <form name="publication_indexing">
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>language</dc-element>
-          <dc-qualifier>iso</dc-qualifier>
-          <repeatable>false</repeatable>
-          <label>Language</label>
-          <input-type value-pairs-name="common_iso_languages">dropdown</input-type>
-          <hint>Select the language of the main content of the item.  If the language does not appear in the list, please select 'Other'.  If the content does not really have a language (for example, if it is a dataset or an image) please select 'N/A'.</hint>
-          <required />
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>dc</dc-schema>
-          <dc-element>subject</dc-element>
-          <repeatable>true</repeatable>
-          <label>Subject Keywords</label>
-          <input-type>tag</input-type>
-          <hint>Enter appropriate subject keywords or phrases.</hint>
-          <required />
-        </field>
-      </row>
-      <row>
-        <field>
-          <dc-schema>datacite</dc-schema>
-          <dc-element>subject</dc-element>
-          <dc-qualifier>fos</dc-qualifier>
-          <repeatable>true</repeatable>
-          <label>Fields of Science and Technology (OECD)</label>
-          <input-type>onebox</input-type>
-          <hint />
-          <required />
-          <vocabulary closed="true">oecd</vocabulary>
+          <hint />
+          <vocabulary closed="true">oecd</vocabulary>
         </field>
       </row>
       <row>
@@ -913,11 +659,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>abstract</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Abstract</label>
           <input-type>textarea</input-type>
-          <hint>Enter the abstract of the item.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Enter the abstract of the item.</hint>
         </field>
       </row>
     </form>
@@ -927,12 +673,12 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>publication</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Part Of</label>
-          <type-bind>publication-coar-types:c_3248,publication-coar-types:c_5794,publication-coar-types:c_6670</type-bind>
           <input-type>onebox</input-type>
-          <hint>The publication where this publication is included. E.g. a book chapter lists here the book, a contribution to a conference lists here the conference proceeding.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The publication where this publication is included. E.g. a book chapter lists here the book, a contribution to a conference lists here the conference proceeding.</hint>
+          <type-bind>publication-coar-types:c_3248,publication-coar-types:c_5794,publication-coar-types:c_6670</type-bind>
         </field>
       </row>
       <row>
@@ -940,12 +686,12 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>isbn</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>ISBN (of the container)</label>
-          <type-bind>publication-coar-types:c_3248,publication-coar-types:c_5794,publication-coar-types:c_6670</type-bind>
           <input-type>onebox</input-type>
-          <hint>The ISBN of the book/report if it was not found in the system</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The ISBN of the book/report if it was not found in the system</hint>
+          <type-bind>publication-coar-types:c_3248,publication-coar-types:c_5794,publication-coar-types:c_6670</type-bind>
         </field>
       </row>
       <row>
@@ -953,12 +699,12 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>doi</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>DOI (of the container)</label>
-          <type-bind>publication-coar-types:c_3248,publication-coar-types:c_5794,publication-coar-types:c_6670</type-bind>
           <input-type>onebox</input-type>
-          <hint>The DOI of the book/report if it was not found in the system</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The DOI of the book/report if it was not found in the system</hint>
+          <type-bind>publication-coar-types:c_3248,publication-coar-types:c_5794,publication-coar-types:c_6670</type-bind>
         </field>
       </row>
       <row>
@@ -966,11 +712,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>journal</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Journal or Serie</label>
           <input-type>onebox</input-type>
-          <hint>The journal or Serie where this publication has been published</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The journal or Serie where this publication has been published</hint>
         </field>
       </row>
       <row>
@@ -978,11 +724,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>ispartofseries</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Series/Report No.</label>
           <input-type>series</input-type>
-          <hint>Enter the series and number assigned to this item by your community.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter the series and number assigned to this item by your community.</hint>
         </field>
       </row>
       <row>
@@ -990,11 +736,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>issn</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>ISSN</label>
           <input-type>onebox</input-type>
-          <hint>The journal or Serie ISSN if it was not found in the system</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The journal or Serie ISSN if it was not found in the system</hint>
         </field>
       </row>
       <row>
@@ -1002,12 +748,12 @@
           <dc-schema>dc</dc-schema>
           <dc-element>coverage</dc-element>
           <dc-qualifier>publication</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Review of</label>
-          <type-bind>publication-coar-types:c_efa0,publication-coar-types:c_ba08</type-bind>
           <input-type>onebox</input-type>
-          <hint>The publication object of the review</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The publication object of the review</hint>
+          <type-bind>publication-coar-types:c_efa0,publication-coar-types:c_ba08</type-bind>
         </field>
       </row>
       <row>
@@ -1015,12 +761,12 @@
           <dc-schema>dc</dc-schema>
           <dc-element>coverage</dc-element>
           <dc-qualifier>isbn</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>ISBN (of the reviewed item)</label>
-          <type-bind>publication-coar-types:c_efa0,publication-coar-types:c_ba08</type-bind>
           <input-type>onebox</input-type>
-          <hint>The ISBN of the reviewed item if it was not found in the system</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The ISBN of the reviewed item if it was not found in the system</hint>
+          <type-bind>publication-coar-types:c_efa0,publication-coar-types:c_ba08</type-bind>
         </field>
       </row>
       <row>
@@ -1028,12 +774,12 @@
           <dc-schema>dc</dc-schema>
           <dc-element>coverage</dc-element>
           <dc-qualifier>doi</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>DOI (of the reviewed item)</label>
-          <type-bind>publication-coar-types:c_efa0,publication-coar-types:c_ba08</type-bind>
           <input-type>onebox</input-type>
-          <hint>The DOI of the reviewed item if it was not found in the system</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The DOI of the reviewed item if it was not found in the system</hint>
+          <type-bind>publication-coar-types:c_efa0,publication-coar-types:c_ba08</type-bind>
         </field>
       </row>
       <row>
@@ -1041,11 +787,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>sponsorship</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Sponsors</label>
           <input-type>onebox</input-type>
-          <hint>Enter the name of any sponsors.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter the name of any sponsors.</hint>
         </field>
       </row>
       <row>
@@ -1053,11 +799,11 @@
           <dc-schema>oaire</dc-schema>
           <dc-element>citation</dc-element>
           <dc-qualifier>volume</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Volume</label>
           <input-type>onebox</input-type>
-          <hint>If applicable, the volume of the publishing channel where this publication appeared</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>If applicable, the volume of the publishing channel where this publication appeared</hint>
         </field>
       </row>
       <row>
@@ -1065,11 +811,11 @@
           <dc-schema>oaire</dc-schema>
           <dc-element>citation</dc-element>
           <dc-qualifier>issue</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Issue</label>
           <input-type>onebox</input-type>
-          <hint>If applicable, the issue of the publishing channel where this publication appeared</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>If applicable, the issue of the publishing channel where this publication appeared</hint>
         </field>
       </row>
       <row>
@@ -1077,11 +823,11 @@
           <dc-schema>oaire</dc-schema>
           <dc-element>citation</dc-element>
           <dc-qualifier>startPage</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Start Page</label>
           <input-type>onebox</input-type>
-          <hint>If applicable, the page where this publication starts</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>If applicable, the page where this publication starts</hint>
         </field>
       </row>
       <row>
@@ -1089,11 +835,11 @@
           <dc-schema>oaire</dc-schema>
           <dc-element>citation</dc-element>
           <dc-qualifier>endPage</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>End Page</label>
           <input-type>onebox</input-type>
-          <hint>If applicable, the page where this publication ends</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>If applicable, the page where this publication ends</hint>
         </field>
       </row>
     </form>
@@ -1103,11 +849,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>funding</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Funding</label>
           <input-type>group</input-type>
-          <hint>Acknowledge the funding received for this publication.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Acknowledge the funding received for this publication.</hint>
         </field>
       </row>
       <row>
@@ -1115,11 +861,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>project</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Projects</label>
           <input-type>onebox</input-type>
-          <hint>Enter the name of project, if any, that has produced this publication. It is NOT necessary to list the projects connected with an acknowledge funding.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter the name of project, if any, that has produced this publication. It is NOT necessary to list the projects connected with an acknowledge funding.</hint>
         </field>
       </row>
       <row>
@@ -1127,11 +873,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>conference</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Conference</label>
           <input-type>onebox</input-type>
-          <hint>Enter the name of the conference where the item has been presented, if any.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter the name of the conference where the item has been presented, if any.</hint>
         </field>
       </row>
       <row>
@@ -1139,11 +885,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>product</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Dataset or product</label>
           <input-type>onebox</input-type>
-          <hint>Link the item to one or more existent dataset in the repository used or described by the publication or, put here the dataset citation</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Link the item to one or more existent dataset in the repository used or described by the publication or, put here the dataset citation</hint>
         </field>
       </row>
       <row>
@@ -1151,22 +897,22 @@
           <dc-schema>dc</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>citation</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Citation</label>
           <input-type>onebox</input-type>
-          <hint>Enter the standard citation for the previously issued instance of this item.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Enter the standard citation for the previously issued instance of this item.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
-          <repeatable>false</repeatable>
           <label>Description</label>
           <input-type>textarea</input-type>
-          <hint>Enter any other description or comments in this box.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Enter any other description or comments in this box.</hint>
         </field>
       </row>
       <row>
@@ -1174,11 +920,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>sponsorship</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Sponsors</label>
           <input-type>onebox</input-type>
-          <hint>Enter the name of any sponsors.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter the name of any sponsors.</hint>
         </field>
       </row>
     </form>
@@ -1187,23 +933,23 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>identifier</dc-element>
-          <repeatable>true</repeatable>
           <label>Identifiers</label>
           <input-type value-pairs-name="common_identifiers">qualdrop_value</input-type>
-          <hint>If the item has any identification numbers or codes associated with
-            it, please enter the types and the actual numbers or codes.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>If the item has any identification numbers or codes associated with
+it, please enter the types and the actual numbers or codes.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Title</label>
           <input-type>onebox</input-type>
-          <hint>Enter the main title of the item.</hint>
+          <repeatable>false</repeatable>
           <required>You must enter a main title for this item.</required>
+          <hint>Enter the main title of the item.</hint>
         </field>
       </row>
       <row>
@@ -1211,11 +957,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
           <dc-qualifier>alternative</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Other Titles</label>
           <input-type>onebox</input-type>
-          <hint>If the item has any alternative titles, please enter them here.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>If the item has any alternative titles, please enter them here.</hint>
         </field>
       </row>
       <row>
@@ -1223,11 +969,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>date</dc-element>
           <dc-qualifier>issued</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Date of Issue</label>
           <input-type>date</input-type>
-          <hint>Please give the date of previous publication or public distribution. You can leave out the day and/or month if they aren't applicable.</hint>
+          <repeatable>false</repeatable>
           <required>You must enter at least the year.</required>
+          <hint>Please give the date of previous publication or public distribution. You can leave out the day and/or month if they aren't applicable.</hint>
         </field>
       </row>
       <row>
@@ -1235,11 +981,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>version</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Version</label>
           <input-type>onebox</input-type>
-          <hint>If applicable, the version of the product</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>If applicable, the version of the product</hint>
         </field>
       </row>
       <row>
@@ -1247,22 +993,22 @@
           <dc-schema>dc</dc-schema>
           <dc-element>contributor</dc-element>
           <dc-qualifier>author</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Authors</label>
           <input-type>group</input-type>
-          <hint>Enter the names of the authors of this item.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter the names of the authors of this item.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
           <label>Type</label>
           <input-type>onebox</input-type>
-          <hint>Nothing to do here. Note for administrators, this metadata could be completely hide using template item</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Nothing to do here. Note for administrators, this metadata could be completely hide using template item</hint>
           <vocabulary>product-coar-types</vocabulary>
         </field>
       </row>
@@ -1273,22 +1019,22 @@
           <dc-schema>dc</dc-schema>
           <dc-element>language</dc-element>
           <dc-qualifier>iso</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Language</label>
           <input-type value-pairs-name="common_iso_languages">dropdown</input-type>
-          <hint>Select, if applicable, the language of the main content of the item.  If the language does not appear in the list, please select 'Other'.  If the content does not really have a language (for example, if it is a dataset or an image) please select 'N/A'.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Select, if applicable, the language of the main content of the item.  If the language does not appear in the list, please select 'Other'.  If the content does not really have a language (for example, if it is a dataset or an image) please select 'N/A'.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>subject</dc-element>
-          <repeatable>true</repeatable>
           <label>Subject Keywords</label>
           <input-type>tag</input-type>
-          <hint>Enter appropriate subject keywords or phrases.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter appropriate subject keywords or phrases.</hint>
         </field>
       </row>
       <row>
@@ -1296,11 +1042,11 @@
           <dc-schema>datacite</dc-schema>
           <dc-element>subject</dc-element>
           <dc-qualifier>fos</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Fields of Science and Technology (OECD)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
           <vocabulary closed="true">oecd</vocabulary>
         </field>
       </row>
@@ -1309,11 +1055,22 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>abstract</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Abstract</label>
           <input-type>textarea</input-type>
+          <repeatable>false</repeatable>
+          <required />
           <hint>Enter the abstract of the item.</hint>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>dc</dc-schema>
+          <dc-element>description</dc-element>
+          <label>Other information</label>
+          <input-type>textarea</input-type>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Enter any other relevant information about the dataset.</hint>
         </field>
       </row>
     </form>
@@ -1322,11 +1079,11 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>publisher</dc-element>
-          <repeatable>true</repeatable>
           <label>Publisher</label>
           <input-type>onebox</input-type>
-          <hint>The publisher or publishers of this product</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>The publisher or publishers of this product</hint>
         </field>
       </row>
       <row>
@@ -1334,11 +1091,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>ispartofseries</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Series/Report No.</label>
           <input-type>series</input-type>
-          <hint>Link to the research output of which this product is a part (e.g. a data set collection that contains it).</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Link to the research output of which this product is a part (e.g. a data set collection that contains it).</hint>
         </field>
       </row>
       <row>
@@ -1346,11 +1103,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>issn</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>ISSN</label>
           <input-type>onebox</input-type>
-          <hint>The journal or Serie ISSN if it was not found in the system</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The journal or Serie ISSN if it was not found in the system</hint>
         </field>
       </row>
       <row>
@@ -1358,11 +1115,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>funding</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Funding</label>
           <input-type>group</input-type>
-          <hint>Acknowledge the funding received for this product.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Acknowledge the funding received for this product.</hint>
         </field>
       </row>
       <row>
@@ -1370,11 +1127,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>project</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Projects</label>
           <input-type>onebox</input-type>
-          <hint>Enter the name of project, if any, that has produced this product. It is NOT necessary to list the projects connected with an acknowledge funding.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter the name of project, if any, that has produced this product. It is NOT necessary to list the projects connected with an acknowledge funding.</hint>
         </field>
       </row>
       <row>
@@ -1382,11 +1139,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>conference</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Conference</label>
           <input-type>onebox</input-type>
-          <hint>The event where this product was presented or that is recorded in the product.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The event where this product was presented or that is recorded in the product.</hint>
         </field>
       </row>
       <row>
@@ -1394,11 +1151,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>equipment</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Generated by</label>
           <input-type>onebox</input-type>
-          <hint>The equipment that generated this product</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>The equipment that generated this product</hint>
         </field>
       </row>
       <row>
@@ -1406,11 +1163,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>references</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>References</label>
           <input-type>onebox</input-type>
-          <hint>Result outputs that are referenced by this product</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Result outputs that are referenced by this product</hint>
         </field>
       </row>
       <row>
@@ -1418,11 +1175,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>publication</dc-qualifier>
-          <repeatable>true</repeatable>
-          <label>References</label>
-          <input-type>onebox</input-type>
-          <hint>Result outputs that use this product</hint>
+          <label>Used by</label>
+          <input-type>inline-group</input-type>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Result outputs that use this product</hint>
         </field>
       </row>
     </form>
@@ -1432,11 +1189,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>patentno</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Patent Number</label>
           <input-type>onebox</input-type>
-          <hint>The patent number</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The patent number</hint>
         </field>
       </row>
       <row>
@@ -1453,11 +1210,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>applicationnumber</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Application Number</label>
           <input-type>onebox</input-type>
-          <hint>The application number</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>The application number</hint>
         </field>
         <field>
           <dc-schema>dc</dc-schema>
@@ -1465,30 +1222,31 @@
           <dc-qualifier>issued</dc-qualifier>
           <label>Publication Date</label>
           <input-type>date</input-type>
-          <hint>Date on which the application was physically received at the Patent Authority. Also named Filling Date</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Date on which the application was physically received at the Patent Authority. Also named Filling Date.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Title</label>
           <input-type>onebox</input-type>
-          <hint>The title of the patent</hint>
+          <repeatable>false</repeatable>
           <required>You must specify a title for the patent</required>
+          <hint>The title of the patent</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dcterms</dc-schema>
           <dc-element>dateAccepted</dc-element>
-          <repeatable>false</repeatable>
           <label>Approval Date</label>
           <input-type>date</input-type>
-          <hint>Date on which the application has been granted by the Patent Office.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Date on which the application has been granted by the Patent Office.</hint>
         </field>
       </row>
       <row>
@@ -1497,8 +1255,9 @@
           <dc-element>dateSubmitted</dc-element>
           <label>Registration Date</label>
           <input-type>date</input-type>
-          <hint>Date of making available to the public by printing or similar process of a patent document on which grant has taken place on or before the said date</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Date of making available to the public by printing or similar process of a patent document on which grant has taken place on or before the said date.</hint>
         </field>
       </row>
       <row>
@@ -1506,44 +1265,44 @@
           <dc-schema>dc</dc-schema>
           <dc-element>contributor</dc-element>
           <dc-qualifier>author</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Inventor(s)</label>
           <input-type>group</input-type>
-          <hint>The inventor: The actual devisor of an invention that is the subject of a patent.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>The inventor: The actual devisor of an invention that is the subject of a patent.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dcterms</dc-schema>
           <dc-element>rightsHolder</dc-element>
-          <repeatable>true</repeatable>
           <label>Holder</label>
           <input-type>onebox</input-type>
-          <hint>The holders of this patent</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>The holders of this patent</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>publisher</dc-element>
-          <repeatable>true</repeatable>
           <label>Issuer</label>
           <input-type>onebox</input-type>
-          <hint>The issuer of the patent: the patent office</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>The issuer of the patent: the patent office</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
           <label>Type</label>
           <input-type>onebox</input-type>
-          <hint>Select the type of content of the patent.</hint>
+          <repeatable>false</repeatable>
           <required>You must select a patent type</required>
+          <hint>Select the type of content of the patent.</hint>
           <vocabulary>patent-coar-types</vocabulary>
         </field>
       </row>
@@ -1566,22 +1325,35 @@
           <dc-schema>dc</dc-schema>
           <dc-element>language</dc-element>
           <dc-qualifier>iso</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Language</label>
           <input-type value-pairs-name="common_iso_languages">dropdown</input-type>
-          <hint>Select the country and its language.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Select the country and its language.</hint>
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>subject</dc-element>
-          <repeatable>true</repeatable>
           <label>Subject Keyword(s)</label>
           <input-type>onebox</input-type>
+          <repeatable>true</repeatable>
+          <required />
           <hint>Enter appropriate subject keywords or phrases.</hint>
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>datacite</dc-schema>
+          <dc-element>subject</dc-element>
+          <dc-qualifier>fos</dc-qualifier>
+          <label>Fields of Science and Technology (OECD)</label>
+          <input-type>onebox</input-type>
+          <repeatable>true</repeatable>
           <required />
+          <hint />
+          <vocabulary closed="true">oecd</vocabulary>
         </field>
       </row>
       <row>
@@ -1589,11 +1361,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>abstract</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Abstract</label>
           <input-type>textarea</input-type>
-          <hint>Enter the description of the patent.</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Enter the description of the patent.</hint>
         </field>
       </row>
     </form>
@@ -1603,11 +1375,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>funding</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Funding</label>
           <input-type>group</input-type>
-          <hint>Acknowledge the funding received for this patent.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Acknowledge the funding received for this patent.</hint>
         </field>
       </row>
       <row>
@@ -1615,11 +1387,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>project</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Projects</label>
           <input-type>onebox</input-type>
-          <hint>Enter the name of project, if any, that has produced this patent. It is NOT necessary to list the projects connected with an acknowledge funding.</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Enter the name of project, if any, that has produced this patent. It is NOT necessary to list the projects connected with an acknowledge funding.</hint>
         </field>
       </row>
       <row>
@@ -1627,11 +1399,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>patent</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Predecessor</label>
           <input-type>onebox</input-type>
-          <hint>Patents that precede (i.e., have priority over) this patent</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Patents that precede (i.e., have priority over) this patent</hint>
         </field>
       </row>
       <row>
@@ -1639,11 +1411,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>references</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>References</label>
           <input-type>onebox</input-type>
-          <hint>Result outputs that are referenced by this patent</hint>
+          <repeatable>true</repeatable>
           <required />
+          <hint>Result outputs that are referenced by this patent</hint>
         </field>
       </row>
     </form>
@@ -1652,22 +1424,22 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Preferred Name</label>
           <input-type>name</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter least at the Surname.</required>
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>name</dc-element>
-          <repeatable>false</repeatable>
           <label>Fullname</label>
           <input-type>name</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -1675,11 +1447,11 @@
           <dc-schema>crisrp</dc-schema>
           <dc-element>name</dc-element>
           <dc-qualifier>translated</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Vernacular Name</label>
           <input-type>name</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -1687,84 +1459,84 @@
           <dc-schema>crisrp</dc-schema>
           <dc-element>name</dc-element>
           <dc-qualifier>variant</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Variants</label>
           <input-type>name</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>person</dc-schema>
           <dc-element>givenName</dc-element>
-          <repeatable>false</repeatable>
           <label>First name</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>person</dc-schema>
           <dc-element>familyName</dc-element>
-          <repeatable>false</repeatable>
           <label>Family name</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>person</dc-schema>
           <dc-element>birthDate</dc-element>
-          <repeatable>false</repeatable>
           <label>Birth Date</label>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>person</dc-element>
           <dc-qualifier>gender</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Gender</label>
           <input-type value-pairs-name="gender">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>person</dc-schema>
           <dc-element>jobTitle</dc-element>
-          <repeatable>false</repeatable>
           <label>Job Title</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>person</dc-schema>
           <dc-element>affiliation</dc-element>
           <dc-qualifier>name</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Main Affiliation</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>workgroup</dc-element>
-          <repeatable>true</repeatable>
           <label>Working group(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -1772,33 +1544,33 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>url</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Personal Site(s)</label>
           <input-type>group</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>person</dc-schema>
           <dc-element>email</dc-element>
-          <repeatable>false</repeatable>
           <label>Email</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>subject</dc-element>
-          <repeatable>true</repeatable>
           <label>Interest(s)</label>
           <input-type>tag</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -1806,11 +1578,11 @@
           <dc-schema>datacite</dc-schema>
           <dc-element>subject</dc-element>
           <dc-qualifier>fos</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Fields of Science and Technology (OECD)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
           <vocabulary closed="true">oecd</vocabulary>
         </field>
       </row>
@@ -1819,11 +1591,11 @@
           <dc-schema>person</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>orcid</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>ORCID</label>
           <input-type>onebox</input-type>
-          <hint>Settable by connecting the entity with ORCID</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Settable by connecting the entity with ORCID</hint>
           <readonly>all</readonly>
         </field>
       </row>
@@ -1832,11 +1604,11 @@
           <dc-schema>person</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>scopus-author-id</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Scopus Author ID</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -1844,11 +1616,11 @@
           <dc-schema>person</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>rid</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Researcher ID</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -1856,11 +1628,11 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>person</dc-element>
           <dc-qualifier>affiliation</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Affiliation(s)</label>
           <input-type>inline-group</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -1868,55 +1640,55 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>abstract</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Biography</label>
           <input-type>textarea</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>education</dc-element>
-          <repeatable>true</repeatable>
           <label>Education(s)</label>
           <input-type>inline-group</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>country</dc-element>
-          <repeatable>false</repeatable>
           <label>Country</label>
           <input-type value-pairs-name="common_iso_countries">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisrp</dc-schema>
           <dc-element>qualification</dc-element>
-          <repeatable>true</repeatable>
           <label>Qualification(s)</label>
           <input-type>inline-group</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>person</dc-schema>
           <dc-element>knowsLanguage</dc-element>
-          <repeatable>true</repeatable>
           <label>Written Language(s)</label>
           <input-type value-pairs-name="common_iso_languages">dropdown</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -1924,11 +1696,11 @@
           <dc-schema>cris</dc-schema>
           <dc-element>policy</dc-element>
           <dc-qualifier>eperson</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Eperson Policy</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -1936,11 +1708,11 @@
           <dc-schema>cris</dc-schema>
           <dc-element>policy</dc-element>
           <dc-qualifier>group</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Group Policy</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
     </form>
@@ -1949,77 +1721,77 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Organization name</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter the oganization name.</required>
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>acronym</dc-element>
-          <repeatable>false</repeatable>
           <label>Acronym or short form of title</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>organization</dc-schema>
           <dc-element>parentOrganization</dc-element>
-          <repeatable>false</repeatable>
           <label>Parent Organisation</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisou</dc-schema>
           <dc-element>director</dc-element>
-          <repeatable>false</repeatable>
           <label>Director</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>organization</dc-schema>
           <dc-element>foundingDate</dc-element>
-          <repeatable>false</repeatable>
           <label>Established</label>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisou</dc-schema>
           <dc-element>boards</dc-element>
-          <repeatable>true</repeatable>
           <label>Scientifics Board</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>organization</dc-schema>
           <dc-element>identifier</dc-element>
-          <repeatable>true</repeatable>
           <label>Identifiers</label>
           <input-type value-pairs-name="orgunit_identifiers">qualdrop_value</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2027,11 +1799,11 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>url</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Website(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2039,11 +1811,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>abstract</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Description for OrgUnit</label>
           <input-type>textarea</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2051,32 +1823,32 @@
           <dc-schema>organization</dc-schema>
           <dc-element>address</dc-element>
           <dc-qualifier>addressLocality</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>City</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>organization</dc-schema>
           <dc-element>address</dc-element>
           <dc-qualifier>addressCountry</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Country</label>
           <input-type value-pairs-name="common_iso_countries">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
           <label>Type</label>
           <input-type value-pairs-name="orgunit_types">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must specify the organisation type</required>
+          <hint />
         </field>
       </row>
     </form>
@@ -2085,88 +1857,88 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Project title</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter the project name.</required>
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>acronym</dc-element>
-          <repeatable>false</repeatable>
           <label>Project Acronym</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crispj</dc-schema>
           <dc-element>coordinator</dc-element>
-          <repeatable>true</repeatable>
           <label>Consortium Coordinator(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>internalid</dc-element>
-          <repeatable>false</repeatable>
           <label>Internal project ID</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crispj</dc-schema>
           <dc-element>partnerou</dc-element>
-          <repeatable>true</repeatable>
           <label>Partner Organization(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crispj</dc-schema>
           <dc-element>investigator</dc-element>
-          <repeatable>false</repeatable>
           <label>Project Coordinator</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter the project coordinator.</required>
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crispj</dc-schema>
           <dc-element>openaireid</dc-element>
-          <repeatable>false</repeatable>
           <label>OpenAIRE ID</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crispj</dc-schema>
           <dc-element>organization</dc-element>
-          <repeatable>true</repeatable>
           <label>Participant Organization(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2174,32 +1946,32 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>identifier</dc-element>
           <dc-qualifier>url</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Project URL</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>oamandate</dc-element>
-          <repeatable>false</repeatable>
           <label>OA Mandate</label>
           <input-type value-pairs-name="truefalse">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>oamandate</dc-element>
           <dc-qualifier>url</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>OA Policy URL</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2207,21 +1979,21 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>project</dc-element>
           <dc-qualifier>startDate</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Start date</label>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>project</dc-element>
           <dc-qualifier>endDate</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Expected Completion</label>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2229,22 +2001,22 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>project</dc-element>
           <dc-qualifier>status</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Status</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
           <label>Project type</label>
           <input-type value-pairs-name="project_types">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2252,33 +2024,33 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>abstract</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Abstract</label>
           <input-type>textarea</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crispj</dc-schema>
           <dc-element>coinvestigators</dc-element>
-          <repeatable>true</repeatable>
           <label>Co-Investigator(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>subject</dc-element>
-          <repeatable>true</repeatable>
           <label>Keyword(s)</label>
           <input-type>tag</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2286,11 +2058,11 @@
           <dc-schema>datacite</dc-schema>
           <dc-element>subject</dc-element>
           <dc-qualifier>fos</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Fields of Science and Technology (OECD)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
           <vocabulary closed="true">oecd</vocabulary>
         </field>
       </row>
@@ -2299,11 +2071,11 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>equipment</dc-qualifier>
-          <repeatable>true</repeatable>
           <label>Uses equipment(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
     </form>
@@ -2312,31 +2084,31 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Name</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter the equipment name.</required>
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>acronym</dc-element>
-          <repeatable>false</repeatable>
           <label>Acronym</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>internalid</dc-element>
-          <repeatable>false</repeatable>
           <label>Internal Funding code</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2344,31 +2116,31 @@
           <dc-schema>dc</dc-schema>
           <dc-element>relation</dc-element>
           <dc-qualifier>project</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Funded project</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>funder</dc-element>
-          <repeatable>false</repeatable>
           <label>Funder</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>fundingParent</dc-element>
-          <repeatable>false</repeatable>
           <label>Program</label>
           <input-type>onebox</input-type>
-          <hint>Link this funding with its upper level if applicable</hint>
+          <repeatable>false</repeatable>
           <required />
+          <hint>Link this funding with its upper level if applicable</hint>
         </field>
       </row>
       <row>
@@ -2376,53 +2148,65 @@
           <dc-schema>crisfund</dc-schema>
           <dc-element>award</dc-element>
           <dc-qualifier>url</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Award Url</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>The url preferably on the funder website of the award notice</required>
+          <hint />
+        </field>
+      </row>
+      <row>
+        <field>
+          <dc-schema>crisfund</dc-schema>
+          <dc-element>award</dc-element>
+          <dc-qualifier>uri</dc-qualifier>
+          <label>Award URI</label>
+          <input-type>onebox</input-type>
+          <repeatable>false</repeatable>
+          <required>The Award URI</required>
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>oamandate</dc-element>
-          <repeatable>false</repeatable>
           <label>OA Mandate</label>
           <input-type value-pairs-name="truefalse">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>oamandate</dc-element>
           <dc-qualifier>url</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>OA Policy URL</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>amount</dc-element>
-          <repeatable>false</repeatable>
           <label>Amount</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>amount</dc-element>
           <dc-qualifier>currency</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Currency</label>
           <input-type value-pairs-name="currency">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2430,97 +2214,97 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>funding</dc-element>
           <dc-qualifier>identifier</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Grant number</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>funding</dc-element>
           <dc-qualifier>startDate</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Start date</label>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>funding</dc-element>
           <dc-qualifier>endDate</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>End date</label>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
           <label>Type</label>
           <input-type value-pairs-name="funding_types">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
-          <repeatable>false</repeatable>
           <label>Funding Description</label>
           <input-type>textarea</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisfund</dc-schema>
           <dc-element>investigators</dc-element>
-          <repeatable>true</repeatable>
           <label>Investigator(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisfund</dc-schema>
           <dc-element>coinvestigators</dc-element>
-          <repeatable>true</repeatable>
           <label>Co-Investigator(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisfund</dc-schema>
           <dc-element>leadorganizations</dc-element>
-          <repeatable>true</repeatable>
           <label>Lead Organization(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisfund</dc-schema>
           <dc-element>leadcoorganizations</dc-element>
-          <repeatable>true</repeatable>
           <label>Lead Co-Organization(s)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
     </form>
@@ -2529,66 +2313,66 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Name</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required>You must enter the equipment name.</required>
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>acronym</dc-element>
-          <repeatable>false</repeatable>
           <label>Acronym</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>internalid</dc-element>
-          <repeatable>false</repeatable>
           <label>Institution Unique Identifier</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisequipment</dc-schema>
           <dc-element>ownerou</dc-element>
-          <repeatable>false</repeatable>
           <label>Owner (Organisations)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisequipment</dc-schema>
           <dc-element>ownerrp</dc-element>
-          <repeatable>false</repeatable>
           <label>Owner (Persons)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
-          <repeatable>false</repeatable>
           <label>Equipment Description</label>
           <input-type>textarea</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
     </form>
@@ -2597,33 +2381,33 @@
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>title</dc-element>
-          <repeatable>false</repeatable>
           <label>Event name</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>acronym</dc-element>
-          <repeatable>false</repeatable>
           <label>Acronym</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>type</dc-element>
-          <repeatable>false</repeatable>
           <label>Event type</label>
           <input-type value-pairs-name="event_types">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2631,21 +2415,21 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>event</dc-element>
           <dc-qualifier>startDate</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Start date</label>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
         <field>
           <dc-schema>oairecerif</dc-schema>
           <dc-element>event</dc-element>
           <dc-qualifier>endDate</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>End date</label>
           <input-type>date</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2653,11 +2437,11 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>event</dc-element>
           <dc-qualifier>place</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Location</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2665,77 +2449,77 @@
           <dc-schema>oairecerif</dc-schema>
           <dc-element>event</dc-element>
           <dc-qualifier>country</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Country</label>
           <input-type value-pairs-name="common_iso_countries">dropdown</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisevent</dc-schema>
           <dc-element>organizerou</dc-element>
-          <repeatable>true</repeatable>
           <label>Organizer(s) of the Event</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisevent</dc-schema>
           <dc-element>organizerpj</dc-element>
-          <repeatable>true</repeatable>
           <label>Organizer(s) of the Event (project)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisevent</dc-schema>
           <dc-element>sponsorou</dc-element>
-          <repeatable>true</repeatable>
           <label>Sponsor(s) of the Event</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisevent</dc-schema>
           <dc-element>sponsorpj</dc-element>
-          <repeatable>true</repeatable>
           <label>Sponsor(s) of the Event (project)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisevent</dc-schema>
           <dc-element>partnerou</dc-element>
-          <repeatable>true</repeatable>
           <label>Partner(s) of the Event</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>crisevent</dc-schema>
           <dc-element>partnerpj</dc-element>
-          <repeatable>true</repeatable>
           <label>Partner(s) of the Event (project)</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
@@ -2743,22 +2527,22 @@
           <dc-schema>dc</dc-schema>
           <dc-element>description</dc-element>
           <dc-qualifier>abstract</dc-qualifier>
-          <repeatable>false</repeatable>
           <label>Event Description</label>
           <input-type>textarea</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
       <row>
         <field>
           <dc-schema>dc</dc-schema>
           <dc-element>subject</dc-element>
-          <repeatable>true</repeatable>
           <label>Keyword(s)</label>
           <input-type>tag</input-type>
-          <hint />
+          <repeatable>true</repeatable>
           <required />
+          <hint />
         </field>
       </row>
     </form>
@@ -2767,11 +2551,11 @@
         <field>
           <dc-schema>cris</dc-schema>
           <dc-element>owner</dc-element>
-          <repeatable>false</repeatable>
           <label>Owner</label>
           <input-type>onebox</input-type>
-          <hint />
+          <repeatable>false</repeatable>
           <required />
+          <hint />
         </field>
       </row>
     </form>
@@ -2932,6 +2716,10 @@
       </pair>
     </value-pairs>
     <value-pairs value-pairs-name="common_iso_languages" dc-term="common_iso_languages">
+      <pair>
+        <displayed-value>N/A</displayed-value>
+        <stored-value />
+      </pair>
       <pair>
         <displayed-value>English (United States)</displayed-value>
         <stored-value>en_US</stored-value>
@@ -3330,6 +3118,10 @@
       </pair>
     </value-pairs>
     <value-pairs value-pairs-name="orgunit_types" dc-term="orgunit_types">
+      <pair>
+        <displayed-value>Unspecified</displayed-value>
+        <stored-value />
+      </pair>
       <pair>
         <displayed-value>Academic Institute</displayed-value>
         <stored-value>Academic Institute</stored-value>
@@ -3384,6 +3176,10 @@
       </pair>
     </value-pairs>
     <value-pairs value-pairs-name="project_types" dc-term="project_types">
+      <pair>
+        <displayed-value>Unspecified</displayed-value>
+        <stored-value />
+      </pair>
       <pair>
         <displayed-value>basic research</displayed-value>
         <stored-value>basic research</stored-value>
@@ -3398,6 +3194,10 @@
       </pair>
     </value-pairs>
     <value-pairs value-pairs-name="funding_types" dc-term="funding_types">
+      <pair>
+        <displayed-value>Unspecified</displayed-value>
+        <stored-value />
+      </pair>
       <pair>
         <displayed-value>Gift</displayed-value>
         <stored-value>Gift</stored-value>
@@ -3420,6 +3220,10 @@
       </pair>
     </value-pairs>
     <value-pairs value-pairs-name="event_types" dc-term="event_types">
+      <pair>
+        <displayed-value>Unspecified</displayed-value>
+        <stored-value />
+      </pair>
       <pair>
         <displayed-value>Conference</displayed-value>
         <stored-value>Conference</stored-value>
@@ -3430,6 +3234,10 @@
       </pair>
     </value-pairs>
     <value-pairs value-pairs-name="common_iso_countries" dc-term="common_iso_countries">
+      <pair>
+        <displayed-value>Unspecified</displayed-value>
+        <stored-value />
+      </pair>
       <pair>
         <displayed-value>Afghanistan</displayed-value>
         <stored-value>AF</stored-value>
@@ -4428,6 +4236,10 @@
       </pair>
     </value-pairs>
     <value-pairs value-pairs-name="bitstream_types" dc-term="bitstream_types">
+      <pair>
+        <displayed-value>Unspecified</displayed-value>
+        <stored-value />
+      </pair>
       <pair>
         <displayed-value>Logo</displayed-value>
         <stored-value>logo</stored-value>