From f918a845828bfe6f895fe88614244dc452b09285 Mon Sep 17 00:00:00 2001
From: Ahmad Obeid <obeid@fh-aachen.de>
Date: Mon, 23 Jun 2025 15:57:11 +0200
Subject: [PATCH 1/6] first accessibilty Changes on 25main solve rebase
 conflict

---
 .../resources/bootswatch-default.html         |   4 +-
 .../resources/mir-layout/template/flatmir.xml |   6 +-
 .../resources/xsl/mir-cosmol-layout-utils.xsl |   8 +-
 .../xsl/mir-flatmir-layout-utils.xsl          |   8 +-
 .../resources/content/publish/index.xml       |   8 +-
 .../resources/content/search/complex.xed      |   2 +-
 .../content/search/complex_intern.xed         |  14 +-
 .../resources/editor/change_genre.xed         |   4 +-
 .../editor/editor-derivate-includes.xed       |  18 +-
 .../resources/editor/editor-includes.xed      | 276 +++++++++---------
 .../META-INF/resources/editor/editor-xml.xed  |   4 +-
 .../META-INF/resources/js/mir/base.js         |  29 ++
 .../config/mir/messages_de.properties         |   1 +
 .../config/mir/messages_en.properties         |   1 +
 .../classificationBrowserData-subselect.xsl   |   2 +-
 .../main/resources/xsl/editor/mir2xeditor.xsl |  65 +++--
 .../resources/xsl/editor/mods2xeditor.xsl     |   2 +-
 .../xsl/layout/mir-common-layout.xsl          |   6 +-
 .../resources/xsl/layout/mir-navigation.xsl   |   4 +-
 .../xsl/metadata/mir-pdf-errorbox.xsl         |   2 +-
 .../src/main/resources/xsl/response-mir.xsl   |  18 +-
 .../main/resources/xsl/response-person.xsl    |   2 +-
 .../src/main/resources/xsl/xeditor-custom.xsl |   2 +-
 .../resources/xsl/xeditor-mir-templates.xsl   |   2 +-
 .../src/components/editor-wrapper.vue         |   7 +-
 .../src/components/editor/array-repeater.vue  |   1 +
 .../components/editor/cartographic-editor.vue |   4 +-
 .../components/editor/geographic-editor.vue   |   1 +
 .../src/components/editor/name-editor.vue     |   1 +
 .../src/components/editor/repeater.vue        |   3 +
 .../components/editor/title-info-editor.vue   |   1 +
 .../src/components/editor/topic-editor.vue    |   1 +
 .../src/components/search/search-form.vue     |   2 +-
 .../src/main/vue/name-search/src/App.vue      |   9 +-
 34 files changed, 283 insertions(+), 235 deletions(-)

diff --git a/mir-layout/src/main/resources/META-INF/resources/bootswatch-default.html b/mir-layout/src/main/resources/META-INF/resources/bootswatch-default.html
index b797f8a74d..7e36667c5e 100644
--- a/mir-layout/src/main/resources/META-INF/resources/bootswatch-default.html
+++ b/mir-layout/src/main/resources/META-INF/resources/bootswatch-default.html
@@ -137,7 +137,7 @@ <h1 id="navbar">Navbar</h1>
                       <li><a href="#">Link</a></li>
                       <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
-                        <ul class="dropdown-menu" role="menu">
+                        <ul class="dropdown-menu">
                           <li><a href="#">Action</a></li>
                           <li><a href="#">Another action</a></li>
                           <li><a href="#">Something else here</a></li>
@@ -181,7 +181,7 @@ <h1 id="navbar">Navbar</h1>
                       <li><a href="#">Link</a></li>
                       <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
-                        <ul class="dropdown-menu" role="menu">
+                        <ul class="dropdown-menu">
                           <li><a href="#">Action</a></li>
                           <li><a href="#">Another action</a></li>
                           <li><a href="#">Something else here</a></li>
diff --git a/mir-layout/src/main/resources/META-INF/resources/mir-layout/template/flatmir.xml b/mir-layout/src/main/resources/META-INF/resources/mir-layout/template/flatmir.xml
index 3a78f6781a..92bcfc4513 100644
--- a/mir-layout/src/main/resources/META-INF/resources/mir-layout/template/flatmir.xml
+++ b/mir-layout/src/main/resources/META-INF/resources/mir-layout/template/flatmir.xml
@@ -60,7 +60,7 @@
                       </ul>
                       <form class="d-flex">
                         <input class="form-control me-sm-2" type="search" placeholder="Search" />
-                        <button class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>
+                        <button aria-label="Search" class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>
                       </form>
                     </div>
                   </div>
@@ -104,7 +104,7 @@
                       </ul>
                       <form class="d-flex">
                         <input class="form-control me-sm-2" type="search" placeholder="Search" />
-                        <button class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>
+                        <button aria-label="Search button" class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>
                       </form>
                     </div>
                   </div>
@@ -148,7 +148,7 @@
                       </ul>
                       <form class="d-flex">
                         <input class="form-control me-sm-2" type="search" placeholder="Search" />
-                        <button class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>
+                        <button aria-label="Search button" class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>
                       </form>
                     </div>
                   </div>
diff --git a/mir-layout/src/main/resources/xsl/mir-cosmol-layout-utils.xsl b/mir-layout/src/main/resources/xsl/mir-cosmol-layout-utils.xsl
index e4eabca632..859490e918 100644
--- a/mir-layout/src/main/resources/xsl/mir-cosmol-layout-utils.xsl
+++ b/mir-layout/src/main/resources/xsl/mir-cosmol-layout-utils.xsl
@@ -56,7 +56,7 @@
             </xsl:choose>
             <div class="input-group mb-3">
               <div class="input-group-append">
-                <button type="submit" class="btn btn-primary">
+                <button type="submit"  aria-label="Search" class="btn btn-primary">
                   <i class="fas fa-search"></i>
                 </button>
               </div>
@@ -110,9 +110,9 @@
         <div class="col-2">
           <h4>Netzwerke</h4>
           <ul class="social_links">
-            <li><a href="#"><button type="button" class="social_icons social_icon_fb"></button>Facebook</a></li>
-            <li><a href="#"><button type="button" class="social_icons social_icon_tw"></button>Twitter</a></li>
-            <li><a href="#"><button type="button" class="social_icons social_icon_gg"></button>Google+</a></li>
+            <li><a href="#"><button type="button" class="social_icons social_icon_fb" aria-label="Facebook"></button>Facebook</a></li>
+            <li><a href="#"><button type="button" class="social_icons social_icon_tw" aria-label="Twitter"></button>Twitter</a></li>
+            <li><a href="#"><button type="button" class="social_icons social_icon_gg" aria-label="Google+"></button>Google+</a></li>
           </ul>
         </div>
         <div class="col-2">
diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
index ebaba75009..328a7de39c 100644
--- a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
+++ b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
@@ -103,7 +103,7 @@
                 </xsl:when>
               </xsl:choose>
 
-              <button type="submit" class="btn btn-primary my-2 my-sm-0">
+              <button type="submit" aria-label="Search" class="btn btn-primary my-2 my-sm-0">
                 <i class="fas fa-search"></i>
               </button>
             </form>
@@ -150,9 +150,9 @@
         <div class="col-2">
           <h4>Netzwerke</h4>
           <ul class="social_links">
-            <li><a href="#"><button type="button" class="social_icons social_icon_fb"></button>Facebook</a></li>
-            <li><a href="#"><button type="button" class="social_icons social_icon_tw"></button>Twitter</a></li>
-            <li><a href="#"><button type="button" class="social_icons social_icon_gg"></button>Google+</a></li>
+            <li><a href="#"><button type="button" class="social_icons social_icon_fb" aria-label="Facebook"></button>Facebook</a></li>
+            <li><a href="#"><button type="button" class="social_icons social_icon_tw" aria-label="Twitter"></button>Twitter</a></li>
+            <li><a href="#"><button type="button" class="social_icons social_icon_gg" aria-label="Google+"></button>Google+</a></li>
           </ul>
         </div>
         <div class="col-2">
diff --git a/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml b/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml
index 7c54ce0c07..bef52168e5 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml
+++ b/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml
@@ -58,7 +58,7 @@
 
       <div class="row mir-form-group">
         <div class="col-sm-3 col-lg-2 control-label">
-          <select name="type" class="form-control form-select">
+          <select aria-label="Andere Datenquelle auswählen" name="type" class="form-control form-select">
             <option value="doi">DOI</option>
             <option value="scopus">Scopus-ID</option>
             <option value="pubmed">PubMed-ID</option>
@@ -70,7 +70,7 @@
           </select>
         </div>
         <div class="col-sm-7 col-md-5 col-lg-4">
-          <input class="form-control" type="text" name="modsId" />
+          <input aria-label="Eingabefeld für mods ID" class="form-control" type="text" name="modsId" />
         </div>
       </div>
 
@@ -137,7 +137,7 @@
 
       <div class="row mir-form-group">
         <div class="col-sm-3 col-lg-2 control-label">
-          <select name="type" class="form-control form-select">
+          <select aria-label="select a mods typ" name="type" class="form-control form-select">
             <option value="doi">DOI</option>
             <option value="scopus">Scopus-ID</option>
             <option value="pubmed">PubMed-ID</option>
@@ -149,7 +149,7 @@
           </select>
         </div>
         <div class="col-sm-7 col-md-5 col-lg-4">
-          <input class="form-control" type="text" name="modsId" />
+          <input aria-label="input field for mods ID" class="form-control" type="text" name="modsId" />
         </div>
       </div>
 
diff --git a/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed b/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed
index 93c9a28858..47ce543dc8 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed
+++ b/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed
@@ -171,7 +171,7 @@
                   </label>
                   <div class="col-md-4">
                     <xed:bind xpath="@name">
-                      <select class="form-control form-select">
+                      <select id="inputSortBy" class="form-control form-select">
                         <option value="mods.dateIssued">
                           <xed:output i18n="component.mods.metaData.dictionary.dateIssued" />
                         </option>
diff --git a/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed b/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed
index a6e23d0718..38fc4152f7 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed
+++ b/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed
@@ -43,7 +43,7 @@
                     <div class="mir-form-group row">
                       <div class="col-md-3">
                         <xed:bind xpath="@field">
-                          <select class="form-control form-select">
+                          <select aria-label="select title" class="form-control form-select">
                             <option value="mods.title">
                               <xed:output i18n="editor.search.mir.title" />
                             </option>
@@ -61,7 +61,7 @@
                       </div>
                       <div class="col-md-2">
                         <xed:bind xpath="@operator">
-                          <select class="form-control form-select">
+                          <select aria-label="select condition" class="form-control form-select">
                             <option value="contains">
                               <xed:output i18n="editor.search.contains" />
                             </option>
@@ -77,7 +77,7 @@
                       <div class="col-md-7 row">
                         <div class="col-md-8">
                           <xed:bind xpath="@value">
-                            <input type="text" class="form-control" />
+                            <input type="text" class="form-control" aria-label="condition input"/>
                           </xed:bind>
                         </div>
                         <div class="btn-group col-md-4">
@@ -125,7 +125,7 @@
                       </label>
                       <div class="col-md-2">
                         <xed:bind xpath="@operator">
-                          <select class="form-control form-select">
+                          <select aria-label="select an operator" class="form-control form-select">
                             <option value="=">=</option>
                             <option value="&gt;">&gt;</option>
                             <option value="&gt;=">&gt;=</option>
@@ -205,12 +205,12 @@
             <xed:bind xpath="sortBy/field">
               <div class="mir-form-group row col-12">
                 <div class="offset-md-3 col-md-9 row">
-                  <label for="Connect1" class="col-md-2" style="padding-left:0">
+                  <label for="connect2" class="col-md-2" style="padding-left:0">
                     <xed:output i18n="editor.search.sortby" />
                   </label>
                   <div class="col-md-4">
                     <xed:bind xpath="@name">
-                      <select class="form-control form-select">
+                      <select id="connect2" class="form-control form-select">
                         <option value="mods.dateIssued">
                           <xed:output i18n="component.mods.metaData.dictionary.dateIssued" />
                         </option>
@@ -222,7 +222,7 @@
                   </div>
                   <div class="col-md-3">
                     <xed:bind xpath="@order">
-                      <select class="form-control form-select">
+                      <select aria-label="descending" class="form-control form-select">
                         <option value="descending">
                           <xed:output i18n="editor.search.descending" />
                         </option>
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/change_genre.xed b/mir-module/src/main/resources/META-INF/resources/editor/change_genre.xed
index 19676d8e03..a841ad588b 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/change_genre.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/change_genre.xed
@@ -16,11 +16,11 @@
       <xed:bind xpath="/mycoreobject/metadata/def.modsContainer[@class='MCRMetaXML']/modsContainer/mods:mods">
         <xed:bind xpath="mods:genre[@type='intern']/@mcr:categId">
           <div class="mir-form-group">
-            <label class="col-md-3 control-label form-label">
+            <label for="mir_genres" class="col-md-3 control-label form-label">
               <xed:output i18n="component.mods.metaData.dictionary.genre" />
             </label>
             <div class="col-md-6">
-              <select class="form-control form-control-inline form-select">
+              <select  id="mir_genres" class="form-control form-control-inline form-select">
                 <xed:include uri="xslStyle:items2options:classification:editorComplete:1:children:mir_genres" />
               </select>
             </div>
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-derivate-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-derivate-includes.xed
index 5b2f123f24..7d25cbb2bd 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-derivate-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-derivate-includes.xed
@@ -19,11 +19,11 @@
   <xed:template id="derivate_types">
     <xed:bind xpath="derivate/classifications[@class='MCRMetaClassification'][@heritable='false']/classification[contains(text(), 'derivate_types:')]">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end d-inline form-label">
+        <label for="derivate__types" class="col-md-3 col-form-label text-end d-inline form-label">
           <xed:output i18n="mir.derivate.type"/>
         </label>
         <div class="col-md-6">
-          <select class="form-control form-control-inline form-select">
+          <select id="derivate__types" class="form-control form-control-inline form-select">
             <option value="">
               <xed:output i18n="mir.select" />
             </option>
@@ -37,11 +37,11 @@
   <xed:template id="mir_access">
     <xed:bind xpath="derivate/classifications[@class='MCRMetaClassification'][@heritable='false']/classification[contains(text(), 'mir_access:')]">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end d-inline form-label">
+        <label for="mir__access" class="col-md-3 col-form-label text-end d-inline form-label">
           <xed:output i18n="mir.access"/>
         </label>
         <div class="col-md-6">
-          <select class="form-control form-control-inline form-select">
+          <select id="mir__access" class="form-control form-control-inline form-select">
             <option value="">
               <xed:output i18n="mir.select" />
             </option>
@@ -55,7 +55,7 @@
   <xed:template id="title_repeat">
     <xed:repeat xpath="derivate/titles[@class='MCRMetaLangText'][@heritable='false'][1]/title">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end d-inline form-label">
+        <label for="title_repeat_TODO" class="col-md-3 col-form-label text-end d-inline form-label">
           <xed:output i18n="mir.title"/>
         </label>
         <div class="col-md-2">
@@ -67,7 +67,7 @@
         </div>
         <div class="col-md-4">
           <xed:bind xpath=".">
-            <input class="form-control" type="text" />
+            <input id="title_repeat_TODO" class="form-control" type="text" />
           </xed:bind>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.derivate.title}" pmud="true"  />
@@ -99,11 +99,11 @@
   <xed:template id="debug.cancel.submit">
     <div class="mir-form-group row" id="editor-buttons">
       <div class="offset-md-2 col-md-6">
-        <button type="submit" class="btn btn-secondary" xed:target="debug">Debug</button>
-        <button type="submit" class="btn btn-secondary" xed:target="cancel">
+        <button aria-label="debug" type="submit" class="btn btn-secondary" xed:target="debug">Debug</button>
+        <button aria-label="cancel" type="submit" class="btn btn-secondary" xed:target="cancel">
           <xed:output i18n="button.cancel" />
         </button>
-        <button type="submit" class="btn btn-primary" xed:target="servlet" xed:href="UpdateDerivateServlet">
+        <button aria-label="save" type="submit" class="btn btn-primary" xed:target="servlet" xed:href="UpdateDerivateServlet">
           <xed:output i18n="button.save" />
         </button>
       </div>
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index d02b7eee3d..568b02acac 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -38,13 +38,13 @@
     <input type="hidden" name="XSL.Status.Style" value="success" />
   </xed:template>
 
-  <xed:template id="genre.base">
-    <label class="col-md-3 col-form-label text-end form-label">
+  <xed:template id="genre.base">   
+    <label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
       <xed:output i18n="component.mods.genre" />
     </label>
     <div class="col-md-6">
       <div class="controls">
-        <select class="form-control form-control-inline form-select">
+        <select id="{xed:generate-id()}" class="form-control form-control-inline form-select">
           <option value="">
             <xed:output i18n="mir.select" />
           </option>
@@ -93,14 +93,14 @@
   <!-- ========== table of contents ========== -->
   <xed:template id="toc-layout">
     <div class="mir-form-group row">
-      <label class="col-md-3 col-form-label text-end form-label">
+      <label for="toc_layout" class="col-md-3 col-form-label text-end form-label">
         <xed:output i18n="component.mods.metaData.dictionary.tocLayout" />:
       </label>
       <xed:bind xpath="../../../../service">
         <xed:bind xpath="servflags[@class='MCRMetaLangText']/servflag[@type='tocLayout']">
           <div class="col-md-6">
             <div class="controls">
-              <select class="form-control form-control-inline form-select">
+              <select id="toc_layout" class="form-control form-control-inline form-select">
                 <option value="">
                   <xed:output i18n="mir.select.optional" />
                 </option>
@@ -118,13 +118,13 @@
 
   <xed:template id="status">
     <div class="mir-form-group row">
-      <label class="col-md-3 col-form-label text-end form-label">
+      <label for="_status" class="col-md-3 col-form-label text-end form-label">
         <xed:output i18n="component.mods.metaData.dictionary.status" />
       </label>
       <xed:bind xpath="servstates[@class='MCRMetaClassification']/servstate[@classid='state']/@categid" initially="{$MIR.Editor.Default.State}">
         <div class="col-md-6">
           <div class="controls">
-            <select class="form-control form-control-inline form-select">
+            <select id="_status" class="form-control form-control-inline form-select">
               <xed:include uri="xslStyle:items2options:classification:editor:-1:children:state" />
             </select>
           </div>
@@ -256,22 +256,22 @@
       <legend class="mir-fieldset-legend">
         <xed:output i18n="mir.title.type.translated" />
       </legend>
-      <xed:repeat xpath="mods:titleInfo[@type='translated']" min="1" max="6">
+      <xed:repeat xpath="mods:titleInfo[@type='translated']" min="1" max="6">        
         <div class="mir-fieldset-content">
           <div class="mir-form-group row">
-            <label class="col-md-3 col-form-label text-end mir-formgroup-label form-label">
+            <label for="title_translated" class="col-md-3 col-form-label text-end mir-formgroup-label form-label">
               <xed:output i18n="mir.title" />
             </label>
             <div class="col-md-6">
               <xed:bind xpath="mods:title">
-                <input type="text" class="form-control" placeholder="{i18n:mir.placeholder.title.translated}" />
+                <input id="title_translated" type="text" class="form-control" placeholder="{i18n:mir.placeholder.title.translated}" />
               </xed:bind>
             </div>
             <mir:help-pmud pmud="true" />
           </div>
           <mir:textfield xpath="mods:subTitle" label="mir.title.subTitle" />
           <div class="mir-form-group row">
-            <label class="col-md-3 col-form-label text-end mir-formgroup-label form-label">
+            <label for="TODO" class="col-md-3 col-form-label text-end mir-formgroup-label form-label">
               <xed:output i18n="mir.language" />
             </label>
             <div class="col-md-6">
@@ -302,19 +302,19 @@
       <xed:repeat xpath="mods:titleInfo" min="1" max="6">
         <div class="mir-fieldset-content">
           <div class="mir-form-group row">
-            <label class="col-md-3 col-form-label text-end form-label">
+            <xed:bind xpath="mods:nonSort"><label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="mir.title.nonSort" />
-            </label>
+            </label></xed:bind><!-- **TODO einrücken-->
             <div class="col-md-6">
               <div class="form-inline controls">
                 <xed:bind xpath="mods:nonSort">
-                  <input type="text" size="9" class="form-control form-control-inline" placeholder="Der/Die/Das" />
+                  <input id="{xed:generate-id()}" type="text" size="9" class="form-control form-control-inline" placeholder="Der/Die/Das" />
                 </xed:bind>
                 <xed:bind xpath="@xml:lang" initially="de">
                   <xed:include ref="lang.list" />
                 </xed:bind>
                 <xed:bind xpath="@type">
-                  <select class="form-control form-control-inline form-select">
+                  <select aria-label="select title type **TODO**" class="form-control form-control-inline form-select">
                     <option value="">
                       <xed:output i18n="mir.title.type.main" />
                     </option>
@@ -483,7 +483,7 @@
       <div class="mir-form-group row">
         <div class="col-md-3">
           <xed:bind xpath="@eventType" default="creation">
-            <select class="form-control form-control-inline date-select form-select">
+            <select aria-label="Select date type" class="form-control form-control-inline date-select form-select">
               <option value="creation">
                 <xed:output i18n="mir.date.created" />
               </option>
@@ -632,12 +632,12 @@
   <xed:template id="nameType">
     <xed:bind xpath="@type" initially="personal">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.nameType" />
         </label>
         <div class="col-md-6">
           <div class="controls">
-            <select class="form-control form-control-inline nameType form-select">
+            <select id="{xed:generate-id()}" class="form-control form-control-inline nameType form-select">
               <option value="personal">
                 <xed:output i18n="mir.nameType.personal" />
               </option>
@@ -655,13 +655,13 @@
   <xed:template id="authorSpecification.repeated">
     <xed:repeat xpath="mods:role/mods:roleTerm[@authorityURI='https://www.mycore.de/classifications/author_roles']" min="1">
       <div class="mir-form-group row authorSpecification">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <xed:bind xpath="@valueURIxEditor"><label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.editor.person.authorSpecification" />
-        </label>
+        </label> </xed:bind> <!--**TODO einrücken-->     
         <div class="col-md-6">
           <div class="controls">
             <xed:bind xpath="@valueURIxEditor">
-              <select class="form-control form-control-inline form-select">
+              <select id="{xed:generate-id()}" class="form-control form-control-inline form-select">
                 <option value="">
                   <xed:output i18n="mir.select.optional" />
                 </option>
@@ -721,7 +721,7 @@
       <div class="mir-form-group row">
         <xed:bind xpath="@type" name="type">
           <div class="col-md-3">
-            <select class="form-control nameIdentifierType form-select" style="text-align:right; font-weight:bold;">
+            <select aria-label="select a name identifier" class="form-control nameIdentifierType form-select" style="text-align:right; font-weight:bold;">
               <xed:include uri="xslStyle:items2options:classification:editor:-1:children:nameIdentifier" />
               <xed:load-resource name="identifier" uri="classification:metadata:-1:children:nameIdentifier" />
               <xed:if test="not($identifier//category[@ID=$type]) and not($type='')">
@@ -733,7 +733,7 @@
           </div>
         </xed:bind>
         <div class="col-md-6">
-          <input type="text" size="20" class="form-control form-control-inline {$xed-validation-marker} nameIdentifier" />
+          <input aria-labelledby="nameIdentifier" type="text" size="20" class="form-control form-control-inline {$xed-validation-marker} nameIdentifier" />
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.nameIdentifier}" pmud="true" />
       </div>
@@ -747,12 +747,12 @@
 
   <xed:template id="topicIdentifier">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="topic_gnd" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic.gnd.type" />
         </label>
         <div class="col-md-6">
           <xed:bind xpath="@valueURIxEditor">
-            <input type="text" size="20" class="form-control form-control-inline topic_gnd" />
+            <input id="topic_gnd" type="text" size="20" class="form-control form-control-inline topic_gnd" />
           </xed:bind>
           <xed:bind xpath="@authority" initially="gnd">
             <input type="hidden" class="topic_gndType" />
@@ -767,7 +767,7 @@
       <div class="mir-form-group row">
         <xed:bind xpath="@type" name="type" initially="termsOfAddress">
           <div class="col-md-3">
-            <select class="form-control form-select" style="text-align:right; font-weight:bold;">
+            <select aria-label="select name part" id="namePart_repeated" class="form-control form-select" style="text-align:right; font-weight:bold;">
               <option value="family">
                 <xed:output i18n="mir.namePart.family" />
               </option>
@@ -787,7 +787,7 @@
           </div>
         </xed:bind>
         <div class="col-md-6">
-          <input type="text" size="20" class="form-control form-control-inline" />
+          <input aria-labelledby="namePart_repeated" type="text" size="20" class="form-control form-control-inline" />
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.namePart}" pmud="true" />
       </div>
@@ -936,11 +936,11 @@
     <fieldset class="dateExtended_box">
       <legend class="mir-fieldset-legend hiddenDetail">
         <div class="mir-form-group row datetimepicker {$xed-validation-marker}">
-          <label class="col-md-3 col-form-label text-end form-label">
+          <label for="{@label}_date" class="col-md-3 col-form-label text-end form-label">
             <xed:output i18n="mir.date.issued.range" />
           </label>
           <div class="col-md-6 center-vertical">
-            <mir:dateRangeInput xpath="mods:originInfo[@eventType='publication']/mods:dateIssued[@encoding='w3cdtf']" class="datetimepicker mainDate"
+            <mir:dateRangeInput id="{@label}_date" xpath="mods:originInfo[@eventType='publication']/mods:dateIssued[@encoding='w3cdtf']" class="datetimepicker mainDate"
               placeholder="{i18n:mir.placeholder.date}" type="publication" startsWithDateTime="false" showDateTimeOption="false"/>
             <span class="fas fa-chevron-down expand-item" title="{i18n:mir.help.expand}" aria-hidden="true"></span>
           </div>
@@ -966,13 +966,13 @@
 
   <xed:template id="identifier.patent">
     <div class="mir-form-group row">
-      <label class="col-md-3 col-form-label text-end form-label">
+      <label for="identifier_patent" class="col-md-3 col-form-label text-end form-label">
         <xed:output i18n="mir.identifier.patent" />
       </label>
       <xed:repeat xpath="mods:identifier[@type='patent']" min="1" max="10">
         <div class="col-md-6">
           <div class="controls">
-            <input type="text" size="30" class="form-control form-control-inline" />
+            <input id="identifier_patent" type="text" size="30" class="form-control form-control-inline" />
           </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.identifier.patent}" pmud="true" />
@@ -1058,7 +1058,7 @@
     <xed:if test="mods:identifierManaged">
       <xed:repeat xpath="mods:identifierManaged" min="0" max="10">
         <div class="mir-form-group row {$xed-validation-marker}">
-          <label class="col-md-3 col-form-label text-end form-label">
+          <label for="managedIdentifier" class="col-md-3 col-form-label text-end form-label">
             <xed:choose>
               <xed:when test="@type='doi'">
                 <xed:output i18n="mir.identifier.doi" />
@@ -1072,7 +1072,7 @@
             </xed:choose>
           </label>
           <div class="col-md-6">
-            <input type="text" size="20" class="form-control form-control-inline managedIdentifier" disabled="true"
+            <input id="managedIdentifier" type="text" size="20" class="form-control form-control-inline managedIdentifier" disabled="true"
                    value="{text()}" data-type="{@type}"/>
           </div>
           <div class="col-md-3"></div>
@@ -1086,7 +1086,7 @@
       <div class="mir-form-group row {$xed-validation-marker}">
         <div class="col-md-3" style="text-align:right; font-weight:bold;">
           <xed:bind xpath="@type" name="type">
-            <select class="form-control identifierSelect form-select">
+            <select aria-label="select an identifier" id="select_ident_id" class="form-control identifierSelect form-select">
               <xed:include uri="xslStyle:items2options:classification:editor:-1:children:identifier" />
               <xed:load-resource name="identifier" uri="classification:metadata:-1:children:identifier" />
               <xed:if test="not($identifier//category[@ID=$type]) and not($type='')">
@@ -1098,7 +1098,7 @@
           </xed:bind>
         </div>
         <div class="col-md-6">
-          <input type="text" size="30" class="form-control form-control-inline" />
+          <input aria-labelledby="select_ident_id" type="text" size="30" class="form-control form-control-inline" />
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.identifier}" pmud="true" />
       </div>
@@ -1111,7 +1111,7 @@
       <div class="mir-form-group row">
         <xed:bind xpath="@type">
           <div class="col-md-3">
-            <select class="form-control identifierSelect form-select" style="text-align:right; font-weight:bold;">
+            <select aria-label="Select an identifier" id="identifierSelect" class="form-control identifierSelect form-select" style="text-align:right; font-weight:bold;">
               <option value="doi">
                 <xed:output i18n="mir.identifier.doi" />
               </option>
@@ -1128,7 +1128,7 @@
           </div>
         </xed:bind>
         <div class="col-md-6">
-          <input type="text" size="20" class="form-control form-control-inline {$xed-validation-marker}" />
+          <input aria-labelledby="identifierSelect" type="text" size="20" class="form-control form-control-inline {$xed-validation-marker}" />
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.doi.handle.urn}" pmud="true" />
       </div>
@@ -1186,7 +1186,7 @@
           <div class="mir-form-group row">
             <div class="col-md-3">
               <xed:bind xpath="@type">
-                <select class="form-control form-control-inline form-select" style="text-align: right; font-weight:bold;">
+                <select aria-label="select related item" id="relatedItem_id" class="form-control form-control-inline form-select" style="text-align: right; font-weight:bold;">
                   <option value="original">
                     <xed:output i18n="mir.relatedItem.original" />
                   </option>
@@ -1201,12 +1201,12 @@
             </div>
             <div class="col-md-6">
               <xed:bind xpath="mods:titleInfo/mods:title">
-                <input type="text" class="form-control" placeholder="{i18n:mir.placeholder.title.link}" />
+                <input aria-labelledby="relatedItem_id" type="text" class="form-control" placeholder="{i18n:mir.placeholder.title.link}" />
               </xed:bind>
             </div>
             <mir:help-pmud help-text="{i18n:mir.help.link.title}" pmud="true" />
           </div>
-          <mir:textfield xpath="mods:location/mods:url[@access='raw object']" help-text="{i18n:mir.help.link.raw_object}" placeholder="{i18n:mir.placeholder.abstract.link}" />
+          <mir:textfield xpath="mods:location/mods:url[@access='raw object']" label="mir.placeholder.abstract.link" help-text="{i18n:mir.help.link.raw_object}" placeholder="{i18n:mir.placeholder.abstract.link}" />
         </div>
       </fieldset>
     </xed:repeat>
@@ -1221,7 +1221,7 @@
       <div class="mir-form-group row">
         <div class="col-md-3">
           <xed:bind xpath="@access">
-            <select class="form-control form-select" style="text-align:right; font-weight:bold;">
+            <select id="link_repeated" aria-label="select form for link **TODO_i18n**" class="form-control form-select" style="text-align:right; font-weight:bold;">
               <option value="">
                 <xed:output i18n="mir.link" />
               </option>
@@ -1238,7 +1238,7 @@
           </xed:bind>
         </div>
         <div class="col-md-6">
-          <input type="text" size="50" class="form-control form-control-inline {$xed-validation-marker}" />
+          <input aria-labelledby="link_repeated" type="text" size="50" class="form-control form-control-inline {$xed-validation-marker}" />
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.link}" pmud="true" />
       </div>
@@ -1317,11 +1317,11 @@
     <xed:load-resource name="mir_filetype" uri="classification:metadata:-1:children:mir_filetype" />
     <xed:bind xpath="mods:physicalDescription/mods:form[@type='file'][@authorityURI=$mir_filetype/label[@xml:lang='x-uri']/@text]/@valueURIxEditor">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="physical_description_form" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.physical.description.form" />
         </label>
         <div class="col-md-6">
-          <select class="form-control form-control-inline form-select">
+          <select id="physical_description_form" class="form-control form-control-inline form-select">
             <xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_filetype" />
           </select>
         </div>
@@ -1358,35 +1358,35 @@
   </xed:template>
 
   <xed:template id="host.pages">
+    <xed:bind xpath="mods:part/mods:extent[@unit='pages']/mods:list">
     <div class="mir-form-group row mir-modspart">
-      <label class="col-md-3 col-form-label text-end form-label">
+      <label for="{xed:generate-id()}_host_pages" class="col-md-3 col-form-label text-end form-label">
         <xed:output i18n="mir.pages" />:
       </label>
       <div class="col-md-6">
         <div class="form-inline">
-          <xed:bind xpath="mods:part/mods:extent[@unit='pages']/mods:list">
-            <input type="text" size="20" class="form-control form-control-inline" />
-          </xed:bind>
+            <input id="{xed:generate-id()}_host_pages" type="text" size="20" class="form-control form-control-inline" />
         </div>
       </div>
       <mir:help-pmud help-text="{i18n:mir.help.host.pages}" />
     </div>
+  </xed:bind>
   </xed:template>
 
   <xed:template id="host.order">
+    <xed:bind xpath="mods:part/@order">
     <div class="mir-form-group row mir-modspart">
-      <label class="col-md-3 col-form-label text-end form-label">
+      <label for="{xed:generate-id()}_host_order" class="col-md-3 col-form-label text-end form-label">
         <xed:output i18n="mir.order" />:
       </label>
       <div class="col-md-6">
         <div class="form-inline">
-          <xed:bind xpath="mods:part/@order">
-            <input type="text" size="20" class="form-control form-control-inline {$xed-validation-marker}" />
-          </xed:bind>
+            <input id="{xed:generate-id()}_host_order" type="text" size="20" class="form-control form-control-inline {$xed-validation-marker}" />
         </div>
       </div>
       <mir:help-pmud help-text="{i18n:mir.help.host.order}" />
     </div>
+  </xed:bind>
   </xed:template>
 
   <xed:template id="host.lecture.semester">
@@ -1400,7 +1400,7 @@
   <xed:template id="language">
     <xed:repeat xpath="mods:language" max="5">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label id="lang_list" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.language" />
         </label>
         <div class="col-md-6">
@@ -1416,7 +1416,7 @@
   </xed:template>
 
   <xed:template id="lang.list">
-    <select class="form-control form-control-inline lang-select form-select" data-dlang="{$MCR.Metadata.DefaultLang}" data-langs="{$MCR.Metadata.Languages}">
+    <select aria-labelledby="lang_list" aria-label="Select a language" class="form-control form-control-inline lang-select form-select" data-dlang="{$MCR.Metadata.DefaultLang}" data-langs="{$MCR.Metadata.Languages}">
       <xed:choose>
         <xed:when test="string-length(.) &gt; 0">
           <option value="{.}" selected="">
@@ -1442,12 +1442,12 @@
   <xed:template id="type.of.resource">
     <xed:bind xpath="mods:typeOfResource/@mcr:categId" initially="typeOfResource:text">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="type_of_resource" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.typeOfResource" />
         </label>
         <div class="col-md-6">
           <div class="controls">
-            <select class="form-control form-control-inline form-select">
+            <select id="type_of_resource" class="form-control form-control-inline form-select">
               <xed:include uri="xslStyle:items2options:classification:editorComplete:1:children:typeOfResource" />
             </select>
           </div>
@@ -1460,13 +1460,13 @@
   <xed:template id="type.of.resource.repeated">
     <xed:repeat xpath="mods:typeOfResource" min="1" max="10">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="type_of_resource_repeated" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.typeOfResource" />
         </label>
         <div class="col-md-6">
           <div class="controls">
             <xed:bind xpath="@mcr:categId">
-              <select class="form-control form-control-inline form-select">
+              <select id="type_of_resource_repeated" class="form-control form-control-inline form-select">
                 <xed:include uri="xslStyle:items2options:classification:editorComplete:1:children:typeOfResource" />
               </select>
             </xed:bind>
@@ -1498,12 +1498,12 @@
   <xed:template id="rights">
     <xed:bind xpath="mods:accessCondition[@type='use and reproduction']" initially="">
       <div class="mir-form-group row required {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="_rights" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.rights" />
           :
         </label>
         <div class="col-md-6">
-          <select class="form-control form-control-inline form-select">
+          <select id="_rights" class="form-control form-control-inline form-select">
             <option value="">
               <xed:output i18n="mir.select" />
             </option>
@@ -1520,12 +1520,12 @@
       <xed:load-resource name="mir_access" uri="classification:metadata:-1:children:mir_access" />
       <xed:bind xpath="@xlink:href" initially="{$mir_access/label[@xml:lang='x-uri']/@text}" />
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="_access" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.access" />
           :
         </label>
         <div class="col-md-6">
-          <select class="form-control form-control-inline form-select">
+          <select id="_access" class="form-control form-control-inline form-select">
             <option value="">
               <xed:output i18n="mir.select.optional" />
             </option>
@@ -1557,27 +1557,27 @@
   </xed:template>
 
   <xed:template id="institutes">
-    <div class="mir-form-group row">
-      <label class="col-md-3 col-form-label text-end form-label">
-        <xed:output i18n="mir.institution" />
-        :
-      </label>
-      <div class="col-md-6">
-        <xed:load-resource name="mir_institutes" uri="classification:metadata:-1:children:mir_institutes" />
-        <xed:bind xpath="mods:name[@type='corporate'][@authorityURI=$mir_institutes/label[@xml:lang='x-uri']/@text]">
-          <xed:bind xpath="mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']" initially="his" /><!--  Host institution [his] -->
-          <xed:bind xpath="@valueURIxEditor">
-            <select class="form-control form-control-inline mir-form__js-select--large form-select">
-              <option value="">
-                <xed:output i18n="mir.select.optional" />
-              </option>
-              <xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_institutes" />
-            </select>
-          </xed:bind>
-        </xed:bind>
+    <xed:load-resource name="mir_institutes" uri="classification:metadata:-1:children:mir_institutes" />
+    <xed:bind xpath="mods:name[@type='corporate'][@authorityURI=$mir_institutes/label[@xml:lang='x-uri']/@text]">
+    <xed:bind xpath="mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']" initially="his" /><!--  Host institution [his] -->
+    <xed:bind xpath="@valueURIxEditor">
+      <div class="mir-form-group row">
+        <label for="{xed:generate-id()}" class="col-md-3 col-form-label text-right">
+          <xed:output i18n="mir.institution" />
+          :
+        </label>
+        <div class="col-md-6">
+          <select id="{xed:generate-id()}" class="form-control form-control-inline mir-form__js-select--large">
+            <option value="">
+              <xed:output i18n="mir.select.optional" />
+            </option>
+            <xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_institutes" />
+          </select>
+        </div>
+        <mir:help-pmud help-text="{i18n:mir.help.institutes}" />
       </div>
-      <mir:help-pmud help-text="{i18n:mir.help.institutes}" />
-    </div>
+    </xed:bind>
+    </xed:bind>  
   </xed:template>
 
   <xed:template id="institutes.repeat">
@@ -1586,7 +1586,7 @@
 
   <xed:template id="publisher.organization">
     <div class="mir-form-group row">
-      <label class="col-md-3 col-form-label text-end form-label">
+      <label for="publisher_organization" class="col-md-3 col-form-label text-end form-label">
         <xed:output i18n="mir.publisherOrganization" />
         :
       </label>
@@ -1597,7 +1597,7 @@
               <input type="hidden" class="nameType" />
             </xed:bind>
             <xed:bind xpath="mods:displayForm">
-              <input type="text" size="26" class="form-control form-control-inline" data-search="searchEntity" data-search-type="select"
+              <input id="publisher_organization" type="text" size="26" class="form-control form-control-inline" data-search="searchEntity" data-search-type="select"
                 data-search-entity-type="organisation" data-search-output=".nameIdentifier" data-search-output-type=".nameIdentifierType" data-search-output-name-type=".nameType" data-search-button="{i18n:button.search}"
                 data-search-button-loading="{i18n:button.loading}" data-search-result-empty="{i18n:mir.searchIdentifier.noResult}" data-target=".search-organization"
                 placeholder="{i18n:mir.placeholder.name.organization}" />
@@ -1618,7 +1618,7 @@
   <xed:template id="publisher.organization.repeat">
     <xed:repeat xpath="mods:name[@type='corporate'][mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']='pbl']"><!--  Publisher [pbl]  -->
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="publisher_organization_repeat" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.publisherOrganization" />
           :
         </label>
@@ -1628,7 +1628,7 @@
               <input type="hidden" class="nameType" />
             </xed:bind>
             <xed:bind xpath="mods:displayForm">
-              <input type="text" size="26" class="form-control form-control-inline" data-search="searchEntity" data-search-type="select"
+              <input id="publisher_organization_repeat" type="text" size="26" class="form-control form-control-inline" data-search="searchEntity" data-search-type="select"
                 data-search-entity-type="organisation" data-search-output=".nameIdentifier" data-search-output-type=".nameIdentifierType" data-search-output-name-type=".nameType" data-search-button="{i18n:button.search}"
                 data-search-button-loading="{i18n:button.loading}" data-search-result-empty="{i18n:mir.searchIdentifier.noResult}" data-target=".search-organization"
                 placeholder="{i18n:mir.placeholder.name.organization}" />
@@ -1653,12 +1653,12 @@
   <xed:template id="sdnb">
     <xed:bind xpath="mods:classification[@authority='sdnb'][@displayLabel='sdnb']">
       <div class="mir-form-group row required {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="_sdnb" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="editor.search.mir.sdnb" />
           :
         </label>
         <div class="col-md-6">
-          <select class="form-control form-control-inline mir-form__js-select--large form-select">
+          <select id="_sdnb" class="form-control form-control-inline mir-form__js-select--large form-select">
             <option value="">
               <xed:output i18n="mir.select" />
             </option>
@@ -1675,12 +1675,12 @@
   <xed:template id="sdnb.repeat">
     <xed:repeat xpath="mods:classification[@authority='sdnb'][@displayLabel='sdnb']" min="1" max="10" method="build">
       <div class="mir-form-group row required {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="editor.search.mir.sdnb" />
           :
         </label>
         <div class="col-md-6">
-          <select class="form-control form-control-inline mir-form__js-select--large form-select">
+          <select id="{xed:generate-id()}" class="form-control form-control-inline mir-form__js-select--large form-select">
             <option value="">
               <xed:output i18n="mir.select" />
             </option>
@@ -1720,17 +1720,17 @@
       <xed:repeat xpath="mods:abstract[@xml:lang]" min="1" max="3">
         <div class="mir-fieldset-content">
           <div class="mir-form-group row">
-            <label class="col-md-3 col-form-label text-end form-label">
+            <label for="abstract_translated" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="mir.abstract.in" />
             </label>
             <div class="col-md-6">
-              <xed:bind xpath="@xml:lang">
-                <xed:include ref="lang.list" />
+              <xed:bind id="abstract_translated" xpath="@xml:lang">
+                <xed:include id="abstract_translated" ref="lang.list" />
               </xed:bind>
             </div>
             <mir:help-pmud help-text="{i18n:mir.help.abstract.language}" pmud="true" />
           </div>
-          <mir:textfield xpath="@xlink:href" label="mir.abstract.aslink" placeholder="{i18n:mir.placeholder.abstract.link}" />
+          <mir:textfield xpath="@xlink:href" label="mir.placeholder.abstract.link" placeholder="{i18n:mir.placeholder.abstract.link}" />
           <mir:textarea xpath="." label="mir.abstract.ortext" rows="5" />
         </div>
       </xed:repeat>
@@ -1755,7 +1755,7 @@
             </div>
             <mir:help-pmud help-text="{i18n:mir.help.abstract.language}" pmud="true" />
           </div>
-          <mir:textfield xpath="@xlink:href" label="mir.abstract.aslink" help-text="{i18n:mir.help.abstract.aslink}" placeholder="{i18n:mir.placeholder.abstract.link}" />
+          <mir:textfield xpath="@xlink:href" label="mir.placeholder.abstract.link" help-text="{i18n:mir.help.abstract.aslink}" placeholder="{i18n:mir.placeholder.abstract.link}" />
           <mir:htmlArea xpath="." label="mir.abstract.ortext" help-text="{i18n:mir.help.abstract.ortext}" rows="5" />
         </div>
       </xed:repeat>
@@ -1770,11 +1770,11 @@
   <xed:template id="geographicAndCartographics">
     <xed:repeat xpath="mods:subjectGEO" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_geographicAndCartographics" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.geographic" />
         </label>
         <div class="col-md-6">
-          <input type="hidden" class="subjectXML"/>
+          <input id="{xed:generate-id()}_geographicAndCartographics" type="hidden" class="subjectXML"/>
           <div class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic,Cartographic" data-search-filter-default="Geographic" data-admin="geographicPair" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.place}" pmud="true"/>
@@ -1786,12 +1786,12 @@
   <xed:template id="geographic">
     <xed:repeat xpath="mods:subjectGEO" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="_geographic" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.geographic" />
         </label>
         <div class="col-md-6">
-          <input type="hidden" class="subjectXML"/>
-          <div class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
+          <input id="_geographic" type="hidden" class="subjectXML"/>
+          <div id="_geographic" class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.place}" pmud="true"/>
       </div>
@@ -1802,12 +1802,12 @@
   <xed:template id="geographic.complex">
     <xed:repeat xpath="mods:subjectGEO" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="geographic_complex" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.geographic" />
         </label>
         <div class="col-md-6">
-          <input type="hidden" class="subjectXML"/>
-          <div class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
+          <input id="geographic_complex" type="hidden" class="subjectXML"/>
+          <div id="geographic_complex" class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.place}" pmud="true"/>
       </div>
@@ -1818,12 +1818,12 @@
   <xed:template id="cartographics">
     <xed:bind xpath="mods:subjectGEO">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="_cartographics" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.cartographics.coordinates" />
         </label>
         <div class="col-md-6">
-          <input type="hidden" class="subjectXML"/>
-          <div class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
+          <input id="_cartographics" type="hidden" class="subjectXML"/>
+          <div id="_cartographics" class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.coordinates}" pmud="false"/>
       </div>
@@ -1834,12 +1834,12 @@
   <xed:template id="cartographics.repeat">
     <xed:repeat xpath="mods:subjectGEO" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="cartographics_repeat" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.cartographics.coordinates" />
         </label>
         <div class="col-md-6">
           <input type="hidden" class="subjectXML"/>
-          <div class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
+          <div id="cartographics_repeat" class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.coordinates}" pmud="true"/>
       </div>
@@ -1850,12 +1850,12 @@
   <xed:template id="subject.simple">
     <xed:repeat xpath="mods:subjectXML" min="1" max="{$MIR.Editor.repeat.max.subject.simple}">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="search_form" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic"/>
         </label>
         <div class="col-md-6">
           <input type="hidden" class="subjectXML"/>
-          <div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="false"> </div>
+          <div id="subject_simple" class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.subject.topic}" pmud="true"/>
       </div>
@@ -1866,12 +1866,12 @@
   <xed:template id="subject.simple.required">
     <xed:repeat xpath="mods:subjectXML" min="1" max="{$MIR.Editor.repeat.max.subject.simple.required}">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="subject_simple_required" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic"/>
         </label>
         <div class="col-md-6">
           <input type="hidden" class="subjectXML"/>
-          <div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="true"> </div>
+          <div id="subject_simple_required" class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="true"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.subject.topic}" pmud="true"/>
       </div>
@@ -1882,7 +1882,7 @@
   <xed:template id="subject.complex.required">
     <xed:repeat xpath="mods:subjectXML" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="search_form" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic.complex "/>
         </label>
         <div class="col-md-6">
@@ -1898,7 +1898,7 @@
   <xed:template id="subject.complex">
     <xed:repeat xpath="mods:subjectXML" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="search_form" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic.complex"/>
         </label>
         <div class="col-md-6">
@@ -1915,12 +1915,12 @@
   <xed:template id="classification">
     <xed:repeat xpath="mods:classification[@generator='user selected']" min="1" max="10">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="_classification" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.classification" />
         </label>
         <div class="col-md-6">
           <div class="form-inline">
-            <input type="button" class="form-control mir-classification-select" value="{i18n:mir.classification.select}" />
+            <input id="_classification" type="button" class="form-control mir-classification-select" value="{i18n:mir.classification.select}" />
             <xed:bind xpath="@displayLabel">
               <input type="hidden" />
             </xed:bind>
@@ -1947,10 +1947,10 @@
           </div>
           <div class="modal-body">
             <div id="modal-searchInput" class="d-flex flex-row-reverse mb-2">
-              <button class="btn btn-primary">
+              <button class="btn btn-primary" aria-label="Search"> 
                 <span class="fas fa-search form-control-feedback" />
               </button>
-              <input type="text" placeholder="Suche in den Publikationen" class="form-control" autocomplete="off"/>
+              <input type="text" aria-label="Suche in den Publikationen" placeholder="Suche in den Publikationen" class="form-control" autocomplete="off"/>
             </div>
             <div class="container-fluid">
               <div id="modalFrame-body" class="row">
@@ -1967,8 +1967,8 @@
                   </div>
                 </div>
                 <div class="col-md-8 text-end mt-2 mt-md-0">
-                  <button id="modalFrame-cancel" type="button" class="btn btn-danger me-0 ms-1" data-bs-dismiss="modal"></button>
-                  <button id="modalFrame-send" type="button" class="btn btn-primary me-0 ms-1">
+                  <button id="modalFrame-cancel" aria-label="cancel button" type="button" class="btn btn-danger me-0 ms-1" data-bs-dismiss="modal"></button>
+                  <button id="modalFrame-send" aria-label="send button" type="button" class="btn btn-primary me-0 ms-1">
                     <xed:output i18n="button.select"/>
                   </button>
                 </div>
@@ -1982,11 +1982,11 @@
   </xed:template>
 
   <xed:template id="modal.name">
-    <div class="modal fade name-modal" tabindex="-1" role="dialog" aria-labelledby="modal frame" aria-hidden="true">
+    <div class="modal fade name-modal" tabindex="-1" role="dialog" aria-hidden="true">
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-body">
-            <textarea name="" rows="10" cols="76"></textarea>
+            <textarea aria-label="Aria for modal input **TODO**i18n" name="" rows="10" cols="76"></textarea>
           </div>
         </div>
       </div>
@@ -2002,17 +2002,17 @@
         <mir:textfield.nobind id="name" label="mir.project.name" help-text="{i18n:mir.help.project.name}" autocomplete="off" />
         <mir:textfield.nobind id="acronym" label="mir.project.acronym" help-text="{i18n:mir.help.project.acronym}" autocomplete="off" />
         <div class="mir-form-group row">
-          <label class="col-md-3 col-form-label text-end form-label" />
+          <label id="openAIRE" class="col-md-3 col-form-label text-end form-label" />
           <div class="col-md-6">
             <div class="row">
               <div class="col-md-4">
-                <input type="text" class="form-control inputWarning" name="" placeholder="{i18n:mir.project.grantID}" />
+                <input aria-labelledby="openAIRE" type="text" class="form-control inputWarning" name="" placeholder="{i18n:mir.project.grantID}" />
               </div>
               <div class="col-md-4">
-                <input type="text" class="form-control inputWarning" name="" placeholder="{i18n:mir.project.sponsor.programmID}" />
+                <input type="text" aria-labelledby="openAIRE" class="form-control inputWarning" name="" placeholder="{i18n:mir.project.sponsor.programmID}" />
               </div>
               <div class="col-md-4">
-                <input type="text" class="form-control inputWarning" name="" placeholder="{i18n:mir.project.sponsor.organisationID}" />
+                <input type="text" aria-labelledby="openAIRE" class="form-control inputWarning" name="" placeholder="{i18n:mir.project.sponsor.organisationID}" />
               </div>
             </div>
           </div>
@@ -2038,12 +2038,12 @@
       <xed:repeat xpath="mods:note" min="1" max="5">
         <div class="mir-fieldset-content">
           <div class="mir-form-group row">
-            <label class="col-md-3 col-form-label text-end form-label">
+            <label for="comment_complex" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="mir.comment.type" />
             </label>
             <div class="col-md-6">
               <xed:bind xpath="@type">
-                <select class="form-control form-select">
+                <select id="comment_complex" class="form-control form-select">
                     <option value="">
                       <xed:output i18n="mir.select"/>
                     </option>
@@ -2059,7 +2059,7 @@
     </fieldset>
   </xed:template>
 
-  //finds all documents, even if they are not published yet
+  <!--//finds all documents, even if they are not published yet-->
   <xed:template id="related.item.search.of.all.items">
     <fieldset>
       <legend class="mir-fieldset-legend">Related Item</legend><!-- TODO: i18n -->
@@ -2068,7 +2068,7 @@
           <div class="mir-form-group row">
             <div class="col-md-3">
               <xed:bind xpath="@type">
-                <select class="form-control form-select">
+                <select aria-label="select a host for the publication" class="form-control form-select">
                   <option value="host">
                     <xed:output i18n="mir.relatedItem.host" />
                   </option>
@@ -2112,7 +2112,7 @@
           </div>
           <xed:include ref="title.nonrequired" />
           <xed:include ref="genre.simple.nonrequired" />
-          <mir:textfield xpath="mods:location/mods:url[@access='raw object']" help-text="{i18n:mir.help.link.raw_object}"
+          <mir:textfield xpath="mods:location/mods:url[@access='raw object']" label="mir.abstract.aslink" help-text="{i18n:mir.help.link.raw_object}"
               placeholder="{i18n:mir.placeholder.abstract.link}" />
           <xed:include ref="host.volume" />
           <xed:include ref="host.issue" />
@@ -2136,7 +2136,7 @@
           <div class="mir-form-group row">
             <div class="col-md-3">
               <xed:bind xpath="@otherType">
-                <select class="form-control form-select">
+                <select aria-label="select if the link has grouping" class="form-control form-select">
                   <xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_relateditem" />
                 </select>
               </xed:bind>
@@ -2165,29 +2165,29 @@
       </legend>
       <div class="mir-fieldset-content">
         <div class="mir-form-group row">
-          <label class="col-md-2 offset-md-3 col-form-label text-end form-label">
+          <label for="characteristics_year" class="col-md-2 offset-md-3 col-form-label text-end form-label">
             <xed:output i18n="component.mods.metaData.dictionary.year" />
           </label>
-          <label class="col-md-2 col-form-label text-end form-label">
+          <label for="characteristics_factor" class="col-md-2 col-form-label text-end form-label">
             <xed:output i18n="component.mods.metaData.dictionary.impact" />
           </label>
-          <label class="col-md-2 col-form-label text-end form-label">
+          <label for="_refereed" class="col-md-2 col-form-label text-end form-label">
             <xed:output i18n="component.mods.metaData.dictionary.refereed" />
           </label>
           <xed:repeat xpath="mods:extension[@displayLabel='characteristics']/chars">
             <div class="col-md-2 offset-md-3">
               <xed:bind xpath="@year">
-                <input type="text" class="form-control" placeholder="{i18n:mir.placeholder.characteristics.year}" />
+                <input id="characteristics_year" type="text" class="form-control" placeholder="{i18n:mir.placeholder.characteristics.year}" />
               </xed:bind>
             </div>
             <div class="col-md-2">
               <xed:bind xpath="@factor">
-                <input type="text" class="form-control" placeholder="{i18n:mir.placeholder.characteristics.factor}" />
+                <input id="characteristics_factor" type="text" class="form-control" placeholder="{i18n:mir.placeholder.characteristics.factor}" />
               </xed:bind>
             </div>
             <div class="col-md-2">
               <xed:bind xpath="@refereed">
-                <select class="form-control form-select" style="font-weight:bold;">
+                <select id="_refereed" class="form-control form-select" style="font-weight:bold;">
                   <option value="">
                     <xed:output i18n="mir.select.optional" />
                   </option>
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-xml.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-xml.xed
index 6395d6c9c0..1571715fc8 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-xml.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-xml.xed
@@ -20,11 +20,11 @@
       <xed:bind xpath="/raw">
 
         <div class="mir-form-group">
-          <label class="col-md-10 control-label form-label" for="raw">
+          <label for="_{$id}" class="col-md-10 control-label form-label">
             <xed:output value="$id" />
           </label>
           <div class="col-md-10">
-            <textarea class="form-control" rows="30" />
+            <textarea id="_{$id}" class="form-control" rows="30" />
           </div>
         </div>
 
diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js
index f17a440025..af9ee16d90 100644
--- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js
+++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js
@@ -795,6 +795,35 @@
   const popoverTriggerList = document.querySelectorAll('[data-bs-toggle="popover"]');
   const popoverList = [...popoverTriggerList].map(popoverTriggerEl => new bootstrap.Popover(popoverTriggerEl, {html:true}));
 
+  /* =================
+  /   go back to top
+  /  ================= */
+  // create html code for button
+  var back_to_top_button = ['<button class="btn back-to-top" aria-label="UP button"><i class="fas fa-chevron-circle-up"></i></button>'].join("");
+  // add button to page
+  $("#page").append(back_to_top_button);
+  // hide button
+  $(".back-to-top").hide();
+  // on scroll
+  $(function () {
+    $(window).scroll(function () {
+      // if scrolled down
+      if ($(this).scrollTop() > 100) {
+        $('.back-to-top').fadeIn();
+      } else {
+        $('.back-to-top').fadeOut();
+      }
+    });
+  });
+  // click button
+  $('.back-to-top').click(function () {
+    $('body,html').animate({
+      scrollTop: 0
+    }, 800);
+    return false;
+  });
+  /* end: go back to top */
+
 })(jQuery);
 
 // Back to top button functionality
diff --git a/mir-module/src/main/resources/config/mir/messages_de.properties b/mir-module/src/main/resources/config/mir/messages_de.properties
index 7314e931ad..487d2cbfe5 100644
--- a/mir-module/src/main/resources/config/mir/messages_de.properties
+++ b/mir-module/src/main/resources/config/mir/messages_de.properties
@@ -29,6 +29,7 @@ button.save                                                                    =
 button.saveandredirect                                                         = Speichern und hochladen...
 button.search                                                                  = Suchen...
 button.select                                                                  = Ausw\u00E4hlen
+component.mods.genre                                                           = Publikationstyp
 button.selectPerson                                                            = Person ausw\u00E4hlen
 component.mods.metaData.dictionary.identifier.hdl                              = Handle
 component.mods.metaData.dictionary.identifier.open-aire                        = OpenAIRE Kennzeichnung
diff --git a/mir-module/src/main/resources/config/mir/messages_en.properties b/mir-module/src/main/resources/config/mir/messages_en.properties
index c9735b20a9..7206e95300 100644
--- a/mir-module/src/main/resources/config/mir/messages_en.properties
+++ b/mir-module/src/main/resources/config/mir/messages_en.properties
@@ -30,6 +30,7 @@ button.saveandredirect                                                         =
 button.search                                                                  = Search...
 button.select                                                                  = Select
 button.selectPerson                                                            = Select person
+component.mods.genre                                                           = Type of the publication
 component.mods.metaData.dictionary.identifier.hdl                              = Handle
 component.mods.metaData.dictionary.identifier.open-aire                        = OpenAIRE Identifier
 component.mods.metaData.dictionary.tocLayout                                   = Table of Contents layout
diff --git a/mir-module/src/main/resources/xsl/classificationBrowserData-subselect.xsl b/mir-module/src/main/resources/xsl/classificationBrowserData-subselect.xsl
index 7f2fb9321f..ab1ee70ce3 100644
--- a/mir-module/src/main/resources/xsl/classificationBrowserData-subselect.xsl
+++ b/mir-module/src/main/resources/xsl/classificationBrowserData-subselect.xsl
@@ -31,7 +31,7 @@
         <li>
           <xsl:choose>
             <xsl:when test="@children = 'true'">
-              <a href="#" id="cbButton_{$id}" onclick="toogle('{@id}','{$folder.closed}','{$folder.open}');"><i class="{$folder.closed}" id="cbButton_{$id}" /></a>
+              <a href="#" aria-label="toogle {$id}" id="cbButton_{$id}" onclick="toogle('toogle','{$folder.closed}','{$folder.open}');"><i class="{$folder.closed}" id="cbButton_{$id}" /></a>
             </xsl:when>
             <xsl:otherwise>
               <i class="{$folder.leaf}" id="cbButton_{$id}" />
diff --git a/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl b/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
index e3fa272122..83ba50fc6b 100644
--- a/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
+++ b/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
@@ -33,11 +33,11 @@
 
   <xsl:template match="mir:textfield.nobind">
     <div class="mir-form-group row">
-      <label class="col-md-3 col-form-label text-end form-label">
+      <label for="nobind_{@label}" class="col-md-3 col-form-label text-end form-label">
         <xed:output i18n="{@label}" />
       </label>
       <div class="col-md-6 {@divClass}">
-        <input id="{@id}" type="text" class="form-control {@inputClass}" name="">
+        <input id="nobind_{@label}" type="text" class="form-control {@inputClass}" name="">
           <xsl:copy-of select="@placeholder" />
           <xsl:copy-of select="@autocomplete" />
         </input>
@@ -67,13 +67,14 @@
   </xsl:template>
 
   <xsl:template name="mir-textfield">
-    <label class="col-md-3 col-form-label text-end form-label">
+    <xsl:variable name="textfield_id" select="concat('textfield',@label,'{xed:generate-id()}')" />
+    <label for="{$textfield_id}" class="col-md-3 col-form-label text-end form-label">
       <xsl:if test="@label">
         <xed:output i18n="{@label}" />
       </xsl:if>
     </label>
     <div class="col-md-6">
-      <input id="{@id}" type="text" class="form-control">
+      <input id="{$textfield_id}" type="text" class="form-control">
         <xsl:copy-of select="@placeholder" />
       </input>
     </div>
@@ -134,7 +135,7 @@
 
   <xsl:template match="mir:dateRange">
     <div class="mir-form-group row">
-      <label class="col-md-3 col-form-label text-end form-label">
+      <label for="{@label}_date" class="col-md-3 col-form-label text-end form-label">
         <xed:output i18n="{@label}" />
       </label>
       <div class="col-md-6 {@class}" data-type="{@type}">
@@ -201,7 +202,7 @@
     <div class="date-format" data-format="simple">
       <div class="date-simple {$hiddenclasssimple} input-group mb-1">
         <xed:bind xpath="{$xpathSimple}">
-          <input type="text" class="form-control {$timeClass}" autocomplete="off">
+          <input id="{@label}_date" type="text" class="form-control {$timeClass}" autocomplete="off">
             <xsl:copy-of select="@placeholder" />
           </input>
         </xed:bind>
@@ -211,13 +212,13 @@
       </div>
       <div class="date-range input-group {$hiddenclassrange} input-daterange">
         <xed:bind xpath="{$xpathStart}">
-          <input type="text" class="form-control {$dateRangeWithTime} startDate" data-point="start">
+          <input aria-label="start Date" type="text" class="form-control {$dateRangeWithTime} startDate" data-point="start">
             <xsl:copy-of select="@placeholder" />
           </input>
         </xed:bind>
         <span class="fas fa-minus input-group-text" aria-hidden="true"></span>
         <xed:bind xpath="{$xpathEnd}">
-          <input type="text" class="form-control {$dateRangeWithTime} endDate" data-point="end">
+          <input aria-label="end Date" type="text" class="form-control {$dateRangeWithTime} endDate" data-point="end">
             <xsl:copy-of select="@placeholder" />
           </input>
         </xed:bind>
@@ -234,7 +235,7 @@
     <xsl:param name="showDateTimeOption" select="'false'" />
     <div class="date-selectFormat">
       <button class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
-      <ul class="dropdown-menu dropdown-menu-end" role="menu">
+      <ul class="dropdown-menu dropdown-menu-end">
         <li>
           <a href="#" class="date-simpleOption dropdown-item">
             <xsl:value-of select="i18n:translate('mir.date.specification')" />
@@ -262,21 +263,22 @@
       <xsl:when test="@repeat = 'true'">
         <xed:repeat xpath="{@xpath}" min="{@min}" max="{@max}">
           <div class="mir-form-group row {@class} {$xed-val-marker}">
-            <label class="col-md-3 col-form-label text-end form-label">
+            <xsl:variable name="htmlArea_id" select="concat('htmlArea',@label,generate-id(.))" />
+            <label for="{$htmlArea_id}" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="{@label}" />
             </label>
             <div class="col-md-6">
               <xsl:choose>
                 <xsl:when test="@bind" >
                   <xed:bind xpath="{@bind}" >
-                    <textarea class="form-control">
+                    <textarea id="{$htmlArea_id}" class="form-control">
                       <xsl:copy-of select="@rows" />
                       <xsl:copy-of select="@placeholder" />
                     </textarea>
                   </xed:bind>
                 </xsl:when>
                 <xsl:otherwise>
-                  <textarea class="form-control tinymce">
+                  <textarea id="{$htmlArea_id}" class="form-control tinymce">
                     <xsl:copy-of select="@rows" />
                     <xsl:copy-of select="@placeholder" />
                   </textarea>
@@ -295,12 +297,13 @@
       </xsl:when>
       <xsl:otherwise>
         <xed:bind xpath="{@xpath}">
+          <xsl:variable name="htmlArea_id2" select="concat('htmlArea2',@label,'{xed:generate-id()}')" />
           <div class="mir-form-group row {@class} {$xed-val-marker}">
-            <label class="col-md-3 col-form-label text-end form-label">
+            <label for="{$htmlArea_id2}" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="{@label}" />
             </label>
             <div class="col-md-6">
-              <textarea class="form-control tinymce">
+              <textarea id="{$htmlArea_id2}" class="form-control tinymce">
                 <xsl:copy-of select="@rows" />
                 <xsl:copy-of select="@placeholder" />
               </textarea>
@@ -325,22 +328,23 @@
     <xsl:choose>
       <xsl:when test="@repeat = 'true'">
         <xed:repeat xpath="{@xpath}" min="{@min}" max="{@max}">
+          <xsl:variable name="textarea_id2" select="concat('textarea2',@label,'{xed:generate-id()}')" />
           <div class="mir-form-group row {@class} {$xed-val-marker}">
-            <label class="col-md-3 col-form-label text-end form-label">
+            <label for="{$textarea_id2}" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="{@label}" />
             </label>
             <div class="col-md-6">
             <xsl:choose>
               <xsl:when test="@bind" >
                 <xed:bind xpath="{@bind}" >
-                  <textarea class="form-control">
+                  <textarea id="{$textarea_id2}" class="form-control">
                     <xsl:copy-of select="@rows" />
                     <xsl:copy-of select="@placeholder" />
                   </textarea>
                 </xed:bind>
               </xsl:when>
               <xsl:otherwise>
-                <textarea class="form-control">
+                <textarea id="{$textarea_id2}" class="form-control">
                   <xsl:copy-of select="@rows" />
                   <xsl:copy-of select="@placeholder" />
                 </textarea>
@@ -359,12 +363,13 @@
       </xsl:when>
       <xsl:otherwise>
         <xed:bind xpath="{@xpath}">
+          <xsl:variable name="textarea_id3" select="'{xed:generate-id()}'" />
           <div class="mir-form-group row {@class} {$xed-val-marker}">
-            <label class="col-md-3 col-form-label text-end form-label">
+            <label for="{$textarea_id3}" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="{@label}" />
             </label>
             <div class="col-md-6">
-              <textarea class="form-control">
+              <textarea id="{$textarea_id3}" class="form-control">
                 <xsl:copy-of select="@rows" />
                 <xsl:copy-of select="@placeholder" />
               </textarea>
@@ -393,7 +398,7 @@
           <xed:bind xpath="mods:displayForm"> <!-- Move down to get the "required" validation right -->
             <div class="mir-form-group row {@class} {$xed-val-marker}">
               <xed:bind xpath=".."> <!-- Move up again after validation marker is set -->
-                <label class="col-md-3 col-form-label text-end form-label">
+                <label for="author_search" class="col-md-3 col-form-label text-end form-label">
                   <xed:output i18n="{@label}" />
                 </label>
                 <div class="col-md-6 center-vertical">
@@ -434,7 +439,7 @@
       <xed:bind xpath="mods:displayForm"> <!-- Move down to get the "required" validation right -->
         <div class="mir-form-group row {@class} {$xed-val-marker}">
           <xed:bind xpath=".."> <!-- Move up again after validation marker is set -->
-            <label class="col-md-3 col-form-label text-end form-label">
+            <label id="personLabel-" for="personLabel-1-1-" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="{@label}" />
             </label>
             <div class="col-md-6">
@@ -466,7 +471,7 @@
               <xed:bind xpath=".."> <!-- Move up again after validation marker is set -->
                 <div class="col-md-3" style="text-align:right; font-weight:bold;">
                   <xed:bind xpath="mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']" initially="aut">
-                    <select class="form-control form-control-inline roleSelect form-select">
+                    <select aria-label="Select role"  id="personLabel-" class="form-control form-control-inline roleSelect form-select">
                       <xsl:apply-templates select="*" />
                     </select>
                   </xed:bind>
@@ -527,7 +532,7 @@
           <xed:bind xpath=".."> <!-- Move up again after validation marker is set -->
             <div class="col-md-3" style="text-align:right; font-weight:bold;">
               <xed:bind xpath="mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']" initially="aut">
-                <select class="form-control form-control-inline form-select">
+                <select  aria-label="select role **TODO**" class="form-control form-control-inline form-select">
                   <xsl:apply-templates select="*" />
                 </select>
               </xed:bind>
@@ -552,7 +557,7 @@
     <xsl:variable name="xed-val-marker" > {$xed-validation-marker} </xsl:variable>
     <xed:repeat xpath="mods:name[@type='corporate'][@authorityURI='{$institutesURI}']" min="{@min}" max="{@max}">
       <div class="mir-form-group row {@class} {$xed-val-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label or="select institute**TODO**2" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="{@label}" />
           :
         </label>
@@ -583,7 +588,7 @@
           <input type="hidden" />
         </xed:bind>
         <div class="mir-form-group row {@class}">
-          <label class="col-md-3 col-form-label text-end form-label">
+          <label for="geographic_input" class="col-md-3 col-form-label text-end form-label"><!--**TODO check where this label is used-->
             <xed:output i18n="{@label}" />
           </label>
           <xsl:choose>
@@ -621,7 +626,7 @@
           <input type="hidden" />
         </xed:bind>
         <div class="mir-form-group row {@class} {$xed-val-marker}">
-          <label class="col-md-3 col-form-label text-end form-label">
+          <label for="topic_input" class="col-md-3 col-form-label text-end form-label">
             <xed:output i18n="{@label}" />
           </label>
           <xsl:choose>
@@ -689,12 +694,12 @@
     <xed:bind xpath="{@xpath}">
       <xsl:variable name="xed-val-marker" > {$xed-validation-marker} </xsl:variable>
       <div class="mir-form-group row {@class} {$xed-val-marker}">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="relItemsearch_{@label}" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="{@label}" />
         </label>
         <div class="col-md-6">
           <div class="input-group">
-            <input class="form-control relItemsearch" data-searchengine="{@searchengine}" data-genre="{@genre}"
+            <input id="relItemsearch_{@label}" class="form-control relItemsearch" data-searchengine="{@searchengine}" data-genre="{@genre}"
                    data-valuexpath="//mods:mods/{@xpath}" data-provide="typeahead" type="text" autocomplete="off"
                    placeholder="{@placeholder}" />
             <span class="input-group-addon searchbadge"> </span>
@@ -716,11 +721,11 @@
   <xsl:template match="mir:itemsearch">
     <xed:bind xpath="{@xpath}">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end form-label">
+        <label for="itemsearch_{@label}" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="{@label}" />
         </label>
         <div class="col-md-6">
-          <input class="form-control itemsearch" data-searchengine="{@searchengine}" data-genre="{@genre}"
+          <input id="itemsearch_{@label}" class="form-control itemsearch" data-searchengine="{@searchengine}" data-genre="{@genre}"
                  data-provide="typeahead" type="text" autocomplete="off"
                  placeholder="{@placeholder}"/>
         </div>
diff --git a/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl b/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
index 0682546bda..909be01cec 100644
--- a/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
+++ b/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
@@ -210,7 +210,7 @@
   </xsl:template>
 
   <xsl:template match="mods:languageTerm[@authority='iso639-2b']">
-    <xsl:variable name="classNodes" select="document(concat('language:',text()))/language/@xmlCode" />
+    <xsl:variable name="classNodes" select="document(concat('language:',text()))/language/@xmlCode" />    
     <xsl:if test="not(preceding-sibling::mods:languageTerm[@authority='rfc5646']/text() = $classNodes)">
       <xsl:if test="not(following-sibling::mods:languageTerm[@authority='rfc5646']/text() = $classNodes)">
         <mods:languageTerm authority="rfc5646" type="code">
diff --git a/mir-module/src/main/resources/xsl/layout/mir-common-layout.xsl b/mir-module/src/main/resources/xsl/layout/mir-common-layout.xsl
index 9e6c554253..18f3a43658 100644
--- a/mir-module/src/main/resources/xsl/layout/mir-common-layout.xsl
+++ b/mir-module/src/main/resources/xsl/layout/mir-common-layout.xsl
@@ -84,7 +84,7 @@
             </strong>
             <span class="caret" />
           </a>
-          <ul class="dropdown-menu" role="menu">
+          <ul class="dropdown-menu">
             <xsl:apply-templates select="$loaded_navigation_xml/menu[@id='user']/*" />
           </ul>
         </li>
@@ -111,7 +111,7 @@
           <xsl:value-of select="$curLang/language/@xmlCode" />
           <span class="caret" />
         </a>
-        <ul class="dropdown-menu language-menu" role="menu">
+        <ul class="dropdown-menu language-menu">
           <xsl:for-each select="$langToken">
             <xsl:variable name="lang"><xsl:value-of select="mcrxsl:trim(.)" /></xsl:variable>
             <xsl:if test="$lang!='' and $CurrentLang!=$lang">
@@ -260,7 +260,7 @@
           <xsl:value-of select="$entryCount" />
         </sup>
       </a>
-      <ul class="dropdown-menu" role="menu">
+      <ul class="dropdown-menu">
         <li>
           <a href="{$ServletsBaseURL}MCRBasketServlet?type={$basket/@type}&amp;action=show" class="dropdown-item">
             <xsl:value-of select="i18n:translate('basket.open')" />
diff --git a/mir-module/src/main/resources/xsl/layout/mir-navigation.xsl b/mir-module/src/main/resources/xsl/layout/mir-navigation.xsl
index b2169533dc..0bbe503671 100644
--- a/mir-module/src/main/resources/xsl/layout/mir-navigation.xsl
+++ b/mir-module/src/main/resources/xsl/layout/mir-navigation.xsl
@@ -17,7 +17,7 @@
       </xsl:if>
         <xsl:apply-templates select="." mode="linkText" />
       </a>
-      <ul class="dropdown-menu" role="menu" aria-labelledby="{$menuId}">
+      <ul class="dropdown-menu" aria-labelledby="{$menuId}">
         <xsl:apply-templates select="item|group" />
       </ul>
     </li>
@@ -83,7 +83,7 @@
             <xsl:apply-templates select="." mode="linkText" />
           </a>
           <xsl:if test="item">
-            <ul class="dropdown-menu" role="menu">
+            <ul class="dropdown-menu">
               <xsl:apply-templates select="item" />
             </ul>
           </xsl:if>
diff --git a/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl b/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl
index f38665b796..a1457cc560 100644
--- a/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl
+++ b/mir-module/src/main/resources/xsl/metadata/mir-pdf-errorbox.xsl
@@ -204,7 +204,7 @@
 
     <xsl:template match="exceptions">
         <xsl:param name="uniqueName" select="'uniqueStacktraceName'"/>
-        <a onclick="$('#{$uniqueName}stacktracecbButton').toggleClass('fa-chevron-right fa-chevron-down');"
+        <a aria-label="toogle {$uniqueName}" onclick="$('#{$uniqueName}stacktracecbButton').toggleClass('fa-chevron-right fa-chevron-down');"
            data-toggle="collapse" href="#collapse{$uniqueName}stacktrace"
            class="text-start text-dark d-flex flex-md-row flex-grow-1 list-group-item align-items-center"
            style="text-decoration: none;">
diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl
index c3ec383ab0..272ae2afc8 100644
--- a/mir-module/src/main/resources/xsl/response-mir.xsl
+++ b/mir-module/src/main/resources/xsl/response-mir.xsl
@@ -357,10 +357,10 @@
                 <xsl:variable name="preparedCurrentQryFromLastRequest"
                               select="translate($decodedCurrentQryFromLastRequest, '&quot;', '')" />
                 <!-- Input element for the second search -->
-                <input class="form-control" id="qry" placeholder="{i18n:translate('mir.placeholder.response.search')}"
+                <input aria-label="{i18n:translate('mir.placeholder.response.search')}" class="form-control" id="qry" placeholder="{i18n:translate('mir.placeholder.response.search')}"
                        type="text" value="{$preparedCurrentQryFromLastRequest}" />
 
-                <button class="btn btn-primary" type="submit">
+                <button aria-label="Search button" class="btn btn-primary" type="submit">
                   <span class="fas fa-search"></span>
                   <xsl:value-of select="i18n:translate('editor.search.search')"/>
                 </button>
@@ -396,7 +396,7 @@
             <input type="hidden" name="uri" value="{concat('mcrobject:',$docID)}" />
           </xsl:for-each>
           <xsl:variable name="buttonDefaultClasses" select="'basket_button btn btn-primary form-control'" />
-          <button type="submit" tabindex="1" value="add">
+          <button type="submit" tabindex="1" aria-label="Plus Button" value="add">
             <xsl:choose>
               <xsl:when test="count($idNodes)=0">
                 <xsl:attribute name="disabled">disabled</xsl:attribute>
@@ -1067,7 +1067,7 @@
             <xsl:value-of select="i18n:translate('mir.response.button.filter')" />
             <span class="caret" />
           </button>
-          <ul class="dropdown-menu dropdown-menu-end" role="menu" style="max-height: 500px; overflow-y: scroll;">
+          <ul class="dropdown-menu dropdown-menu-end" style="max-height: 500px; overflow-y: scroll;">
             <xsl:apply-templates select="$classiDocument/select/option" mode="calculate_option_notselected">
               <xsl:with-param name="classId" select="$classId" />
             </xsl:apply-templates>
@@ -1172,7 +1172,7 @@
           <div class="dropdown-menu dropdown-menu-end stopAutoclose col-md-12 mir-date-arrowTop" role="menu">
             <div class="container-fluid">
               <div class="col-md-12 mir-form-group">
-                <select class="form-control form-select">
+                <select aria-label="select operator" class="form-control form-select">
                   <option value="=">=</option>
                   <option value="&gt;">&gt;</option>
                   <option value="&gt;=">&gt;=</option>
@@ -1182,17 +1182,17 @@
               </div>
               <div class="col-md-12 mir-form-group dateContainer">
                 <div class="col-md-4">
-                  <input class="form-control" placeholder="DD" type="number" min="1" max="31" style="padding: 0.4em" />
+                  <input aria-label="Day" class="form-control" placeholder="DD" type="number" min="1" max="31" style="padding: 0.4em" />
                 </div>
                 <div class="col-md-4">
-                  <input class="form-control" placeholder="MM" type="number" min="1" max="12" style="padding: 0.4em" />
+                  <input aria-label="Month" class="form-control" placeholder="MM" type="number" min="1" max="12" style="padding: 0.4em" />
                 </div>
                 <div class="col-md-4">
-                  <input class="form-control" placeholder="YYYY" type="number" min="1000" max="2050" style="padding: 0.1em" />
+                  <input aria-label="Year" class="form-control" placeholder="YYYY" type="number" min="1000" max="2050" style="padding: 0.1em" />
                 </div>
               </div>
               <div class="col-md-12 mir-form-group">
-                <input id="dateSearch" type="button" class="btn btn-secondary form-control" value="Go!" />
+                <input aria-label="input for search date" id="dateSearch" type="button" class="btn btn-secondary form-control" value="Go!" />
               </div>
             </div>
           </div>
diff --git a/mir-module/src/main/resources/xsl/response-person.xsl b/mir-module/src/main/resources/xsl/response-person.xsl
index 5cbe251667..8e26a749a2 100644
--- a/mir-module/src/main/resources/xsl/response-person.xsl
+++ b/mir-module/src/main/resources/xsl/response-person.xsl
@@ -216,7 +216,7 @@
               </xsl:variable>
 
               <div class="mir-form-group">
-                <label class="sr-only form-label" for="index_search">Gesuchte Zeichen</label>
+                <label  for="index_search" class="sr-only form-label">Gesuchte Zeichen</label>
                 <input value="{$search_value}"
                        name="terms.regex"
                        class="search_text_gray focus_form_field form-control"
diff --git a/mir-module/src/main/resources/xsl/xeditor-custom.xsl b/mir-module/src/main/resources/xsl/xeditor-custom.xsl
index 01605803ff..0f587baa47 100644
--- a/mir-module/src/main/resources/xsl/xeditor-custom.xsl
+++ b/mir-module/src/main/resources/xsl/xeditor-custom.xsl
@@ -35,7 +35,7 @@
       </xsl:choose>
     </xsl:variable>
 
-    <button type="submit" class="btn btn-secondary" name="{$name}">
+    <button type="submit" aria-label="{$symbol} button" class="btn btn-secondary" name="{$name}">
       <i class="fas fa-{$symbol}">
       </i>
     </button>
diff --git a/mir-module/src/main/resources/xsl/xeditor-mir-templates.xsl b/mir-module/src/main/resources/xsl/xeditor-mir-templates.xsl
index 4c4dfcd317..a8ff23afc1 100644
--- a/mir-module/src/main/resources/xsl/xeditor-mir-templates.xsl
+++ b/mir-module/src/main/resources/xsl/xeditor-mir-templates.xsl
@@ -375,7 +375,7 @@
             </xsl:if>
             <xsl:apply-templates select="." mode="inputOptions" />
           </input>
-          <label class="form-check-label form-label" for="{$gId}">
+          <label for="{$gId}" class="form-check-label form-label">
             <xsl:if test="string-length(@i18n) &gt; 0">
               <xed:output i18n="{@i18n}" />
             </xsl:if>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor-wrapper.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor-wrapper.vue
index 1d22afb492..550df76854 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor-wrapper.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor-wrapper.vue
@@ -61,10 +61,10 @@
                             <div class="modal-body">
                                 <div class="row mb-2">
                                     <div class="col-3">
-                                        <label>{{ i18n["mir.editor.subject.custom.modal.type"] }}</label>
+                                        <label :for="selectId">{{ i18n["mir.editor.subject.custom.modal.type"] }}</label>
                                     </div>
                                     <div class="col-7">
-                                        <select v-model="model.custom.type" class="form-control form-control-sm custom-type-select form-select">
+                                        <select :id="selectId" v-model="model.custom.type" class="form-control form-control-sm custom-type-select form-select">
                                             <option v-for="type in possibleTypeList"
                                                     :value="type">
                                                 {{ i18n["mir.editor.subject.custom.modal.type."+type] }}
@@ -146,6 +146,7 @@ import GeographicEditor from "@/components/editor/geographic-editor.vue";
 import CartographicsEditor from "@/components/editor/cartographic-editor.vue";
 import {provideTranslations} from "@/api/I18N";
 
+const selectId = ref('');
 const model = reactive({
     settings: undefined as EditorSettings | undefined,
     subject: undefined as Subject | undefined,
@@ -246,6 +247,7 @@ onMounted(() => {
             });
         }
     }
+    selectId.value = 'custom_typ_select-' + Math.random().toString(36).substring(2, 9);
 });
 const searchSubmitted = async (searchTerm: string) => {
     const jq = (window as any).$;
@@ -284,6 +286,7 @@ const searchEnabled = computed(()=>{
    }
 });
 
+const idForAccessibility = computed(()=>{return Date.now(); });
 // used to display the 'add cartographics button'
 const showCartographics = computed(() => {
     const isPair = model.settings?.admin == 'geographicPair' && possibleTypeList.value.includes('Cartographics');
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/array-repeater.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/array-repeater.vue
index 0dc95344c3..fac3591b62 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/array-repeater.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/array-repeater.vue
@@ -37,6 +37,7 @@
                 <div class="offset-7 col-2">
                     <button :class="`btn btn-sm btn-secondary`"
                             type="button"
+                            aria-label="Plus Button"
                             v-on:click.prevent="addChild(0)">
                         <i class="fas fa-plus"/>
                     </button>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/cartographic-editor.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/cartographic-editor.vue
index a2d7e113ae..30f4e83ac0 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/cartographic-editor.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/cartographic-editor.vue
@@ -35,10 +35,10 @@
         <div class="row mt-2">
             <div class="col-12">
                 <div class="btn-group btn-group-sm">
-                    <button class="btn btn-secondary" @click.prevent="addPolygon">
+                    <button class="btn btn-secondary" aria-label="Plus Button" @click.prevent="addPolygon">
                         <i class="fas fa-plus"></i> {{ i18n["mir.editor.subject.cartographics.editor.add.polygon"] }}
                     </button>
-                    <button class="btn btn-secondary" @click.prevent="addPoint">
+                    <button class="btn btn-secondary" aria-label="Plus Button" @click.prevent="addPoint">
                         <i class="fas fa-plus"></i> {{ i18n["mir.editor.subject.cartographics.editor.add.point"] }}
                     </button>
                 </div>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/geographic-editor.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/geographic-editor.vue
index bbaaff735a..991396f9e6 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/geographic-editor.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/geographic-editor.vue
@@ -28,6 +28,7 @@
 
         <div class="col-7">
             <classification-select v-model="geographic.lang"
+                                   :id="id+'language'"
                                    :empty-label="i18n['mir.editor.subject.editor.language.choose']"
                                    :url="`${webApplicationBaseURL}api/v2/classifications/rfc5646`"/>
         </div>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/name-editor.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/name-editor.vue
index c227397451..bdca3a6c7a 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/name-editor.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/name-editor.vue
@@ -30,6 +30,7 @@
 
         <div class="col-7">
             <classification-select v-model="name.lang"
+                                   :id="id+'language'"
                                    :empty-label="i18n['mir.editor.subject.editor.language.choose']"
                                    :url="`${webApplicationBaseURL}api/v2/classifications/rfc5646`"/>
         </div>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/repeater.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/repeater.vue
index 2eff1bd268..fcd41c1407 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/repeater.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/repeater.vue
@@ -4,6 +4,7 @@
                 :title="props.editTitle"
                 :class="`btn btn-sm btn-secondary${editEnabled? '':' disabled'}${editPressed? ' active':''}`"
                 type="button"
+                aria-label="edit button"
                 v-on:click.prevent="editClicked()">
             <i class="fas fa-edit fa-fw"/>
         </button>
@@ -11,6 +12,7 @@
                 :title="props.plusTitle"
                 :class="`btn btn-sm btn-secondary${plusEnabled? '':' disabled'}`"
                 type="button"
+                aria-label="Plus Button"
                 v-on:click.prevent="plusClicked()">
             <i class="fas fa-plus fa-fw"/>
         </button>
@@ -18,6 +20,7 @@
                 :title="props.minusTitle"
                 :class="`btn btn-sm btn-secondary${minusEnabled? '':' disabled'}`"
                 type="button"
+                aria-label="Minus Button"
                 v-on:click.prevent="minusClicked()">
             <i class="fas fa-minus fa-fw"/>
         </button>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/title-info-editor.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/title-info-editor.vue
index e9ff95af95..fdb4494e56 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/title-info-editor.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/title-info-editor.vue
@@ -33,6 +33,7 @@
 
             <div class="col-7">
                 <classification-select v-model="titleInfo.lang"
+                                       :id="id+'language'"
                                        :empty-label="i18n['mir.editor.subject.editor.language.choose']"
                                        :url="`${webApplicationBaseURL}api/v2/classifications/rfc5646`"/>
             </div>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/topic-editor.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/topic-editor.vue
index 0974b7c83f..9b81a2addd 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/topic-editor.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/topic-editor.vue
@@ -29,6 +29,7 @@
 
         <div class="col-7">
             <classification-select v-model="topic.lang"
+                                   :id="id+'language'"
                                    :empty-label="i18n['mir.editor.subject.editor.language.choose']"
                                    :url="`${webApplicationBaseURL}api/v2/classifications/rfc5646`"/>
         </div>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue b/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue
index 726b3d4259..efc8505ca1 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue
@@ -2,7 +2,7 @@
     <form>
         <div class="mir-form-group">
             <div class="input-group input-group-sm mb-3">
-                <input v-model="model.inputValue" :disabled="searchEnabled?null:''" @submit.prevent type="text" :placeholder="i18n['mir.editor.subject.search.placeholder']" class="form-control search-topic">
+                <input id="search_form" v-model="model.inputValue" :disabled="searchEnabled?null:''" @submit.prevent type="text" :placeholder="i18n['mir.editor.subject.search.placeholder']" class="form-control search-topic">
                 <button class="btn btn-sm btn-primary" type="submit" :disabled="searchEnabled?null:''" @click.prevent="search" >{{ i18n['mir.editor.subject.search'] }}</button>
             </div>
         </div>
diff --git a/mir-webapp/src/main/vue/name-search/src/App.vue b/mir-webapp/src/main/vue/name-search/src/App.vue
index 95b6a158bb..e2490fd48c 100644
--- a/mir-webapp/src/main/vue/name-search/src/App.vue
+++ b/mir-webapp/src/main/vue/name-search/src/App.vue
@@ -4,7 +4,8 @@
       <div ref="input" class="input-group">
         <input :id="`personLabel-${nameLocatorString}`" ref="searchBox" v-model="model.search"
                :placeholder="model.personPlaceholder"
-               class="form-control" type="text"
+               aria-labelledby="personLabel-"
+               class="form-control" type="text"               
                v-on:keydown.enter.prevent="startSearch()">
         <button ref="identifierOpenButton" class="btn btn-secondary"
                 v-on:click.prevent="currentIdentifierClicked()">
@@ -25,7 +26,7 @@
           <template v-if="defineOwnIdentifier">
             <div class="mir-form-group row">
               <div class="col-4">
-                <select v-model="model.currentOwnIdentifierType" class="form-control  form-select">
+                <select aria-label="Select role" v-model="model.currentOwnIdentifierType" class="form-control  form-select">
                   <option selected="selected" value="">{{ model.selectLabel }}</option>
                   <option v-for="identifierType in model.possibleIdentifierTypes" :key="identifierType.value" :value="identifierType.value">
                     {{ identifierType.label }}
@@ -36,7 +37,7 @@
                 <input v-model="model.currentOwnIdentifierValue" class="form-control" type="text"/>
               </div>
               <div class="col-2">
-                <button :title="model.addLabel" class="btn btn-secondary" v-on:click.prevent="addOwnIdentifier()">
+                <button :title="model.addLabel" class="btn btn-secondary" aria-label="Plus Button" v-on:click.prevent="addOwnIdentifier()">
                   <span class="fas fa-plus-circle"> </span>
                 </button>
               </div>
@@ -474,7 +475,7 @@ const closeDrops = () => {
 }
 
 .identifier-count {
-  font-size: 0.6em;
+  font-size: 0.9em;
   margin-left: 4px;
   vertical-align: bottom;
 }

From 0be11d7e5153f4424c3b2afa18575807a8a81702 Mon Sep 17 00:00:00 2001
From: Ahmad Obeid <obeid@fh-aachen.de>
Date: Thu, 15 May 2025 10:09:52 +0200
Subject: [PATCH 2/6] accessibilty

---
 .../resources/content/publish/index.xml       |  8 +--
 .../resources/content/search/complex.xed      | 10 ++--
 .../content/search/complex_intern.xed         |  6 +--
 .../resources/editor/editor-dynamic.xed       |  3 ++
 .../resources/editor/editor-includes.xed      | 52 +++++++++----------
 .../main/resources/xsl/editor/mir2xeditor.xsl | 11 ++--
 .../src/components/editor/repeater.vue        |  2 +
 .../src/components/search/search-form.vue     |  2 +-
 8 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml b/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml
index bef52168e5..97831f66e9 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml
+++ b/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml
@@ -30,7 +30,7 @@
 
       <div class="row mir-form-group">
         <label for="genre" class="col-sm-3 col-lg-2 control-label form-label">
-          <text i18n="component.mods.genre" />
+          Publikationstyp
         </label>
         <div class="col-sm-7 col-md-5 col-lg-4">
           <select id="genre" class="form-control form-select" name="genre" size="1">
@@ -40,7 +40,7 @@
 
       <div class="row mir-form-group">
         <label for="host"  class="col-sm-3 col-lg-2 control-label form-label">
-          <text i18n="mir.select.host" />
+          erschienen in:
         </label>
         <div class="col-sm-7 col-md-5 col-lg-4">
           <select id="host" class="form-control form-select" name="host" size="1">
@@ -109,7 +109,7 @@
 
       <div class="row mir-form-group">
         <label for="genre" class="col-sm-3 col-lg-2 control-label form-label">
-          <text i18n="component.mods.genre" />
+          Type of the publication
         </label>
         <div class="col-sm-7 col-md-5 col-lg-4">
           <select id="genre" class="form-control form-select" name="genre" size="1">
@@ -119,7 +119,7 @@
 
       <div class="row mir-form-group">
         <label for="host"  class="col-sm-3 col-lg-2 control-label form-label">
-          <text i18n="mir.select.host" />
+          appears in:
         </label>
         <div class="col-sm-7 col-md-5 col-lg-4">
           <select id="host" class="form-control form-select" name="host" size="1">
diff --git a/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed b/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed
index 47ce543dc8..dd9411c84b 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed
+++ b/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed
@@ -39,7 +39,7 @@
                   <div class="mir-form-group row">
                     <div class="col-md-3">
                       <xed:bind xpath="@field">
-                        <select class="form-control form-select">
+                        <select aria-label="select search ident" class="form-control form-select">
                           <option value="mods.title">
                             <xed:output i18n="editor.search.mir.title" />
                           </option>
@@ -57,7 +57,7 @@
                     </div>
                     <div class="col-md-2">
                       <xed:bind xpath="@operator">
-                        <select class="form-control form-select">
+                        <select aria-label="select serch operator" class="form-control form-select">
                           <option value="contains">
                             <xed:output i18n="editor.search.contains" />
                           </option>
@@ -73,7 +73,7 @@
                     <div class="col-md-7 row">
                       <div class="col-md-8">
                         <xed:bind xpath="@value">
-                          <input type="text" class="form-control" />
+                          <input aria-label="input field" type="text" class="form-control" />
                         </xed:bind>
                       </div>
                       <div class="btn-group col-md-4">
@@ -116,7 +116,7 @@
                     </label>
                     <div class="col-md-2">
                       <xed:bind xpath="@operator">
-                        <select class="form-control form-select">
+                        <select aria-label="select operator" class="form-control form-select">
                           <option value="=">=</option>
                           <option value="&gt;">&gt;</option>
                           <option value="&gt;=">&gt;=</option>
@@ -183,7 +183,7 @@
                   </div>
                   <div class="col-md-3">
                     <xed:bind xpath="@order">
-                      <select class="form-control form-select">
+                      <select aria-label="select order" class="form-control form-select">
                         <option value="descending">
                           <xed:output i18n="editor.search.descending" />
                         </option>
diff --git a/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed b/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed
index 38fc4152f7..920e9cb5b2 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed
+++ b/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed
@@ -43,7 +43,7 @@
                     <div class="mir-form-group row">
                       <div class="col-md-3">
                         <xed:bind xpath="@field">
-                          <select aria-label="select title" class="form-control form-select">
+                          <select aria-label="sselect search ident" class="form-control form-select">
                             <option value="mods.title">
                               <xed:output i18n="editor.search.mir.title" />
                             </option>
@@ -61,7 +61,7 @@
                       </div>
                       <div class="col-md-2">
                         <xed:bind xpath="@operator">
-                          <select aria-label="select condition" class="form-control form-select">
+                          <select aria-label="select serch operator" class="form-control form-select">
                             <option value="contains">
                               <xed:output i18n="editor.search.contains" />
                             </option>
@@ -77,7 +77,7 @@
                       <div class="col-md-7 row">
                         <div class="col-md-8">
                           <xed:bind xpath="@value">
-                            <input type="text" class="form-control" aria-label="condition input"/>
+                            <input type="text" class="form-control" aria-label="input field"/>
                           </xed:bind>
                         </div>
                         <div class="btn-group col-md-4">
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-dynamic.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-dynamic.xed
index 55a629999e..29ed2f4dec 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-dynamic.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-dynamic.xed
@@ -40,11 +40,13 @@
         <xed:include ref="failed-validation-messages" />
 
         <fieldset>
+          <legend style="display: none;">Submission form<!-- **TODO*i18n*--></legend>
           <xed:include ref="genres.{$genre_intern}" />
         </fieldset>
 
         <xed:if test="not($host='standalone')">
           <fieldset class="mir-relatedItem">
+            <legend style="display: none;"><xed:output i18n="mir.form.editor.dynamic.partof" /></legend>
             <div class="col-md-12 mir-relatedItem-head">
               <xed:output i18n="mir.form.editor.dynamic.partof" />
               <xed:output value="concat($mir_genres//category[@ID=$host]/label[lang($CurrentLang)]/@text,':')" />
@@ -61,6 +63,7 @@
               <xed:if test="contains($mir_genres//category[@ID=$host]/label[lang('x-hosts')]/@text,'series')">
                 <xed:bind xpath="mods:relatedItem[(@type='host')][1]">
                   <fieldset class="mir-relatedItem">
+                    <legend style="display: none;"><xed:output i18n="mir.form.editor.dynamic.partof" /></legend>
                     <div class="col-md-12 mir-relatedItem-head">
                       <xed:output i18n="mir.form.editor.dynamic.partof" />
                       <xed:output value="concat($mir_genres//category[@ID='series']/label[lang($CurrentLang)]/@text,':')" />
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index 568b02acac..6f63a8b45c 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -271,14 +271,14 @@
           </div>
           <mir:textfield xpath="mods:subTitle" label="mir.title.subTitle" />
           <div class="mir-form-group row">
-            <label for="TODO" class="col-md-3 col-form-label text-end mir-formgroup-label form-label">
+            <xed:bind xpath="@xml:lang" initially="de">
+            <label for="{concat(xed:generate-id(), '_lang')}" class="col-md-3 col-form-label text-end mir-formgroup-label form-label">
               <xed:output i18n="mir.language" />
             </label>
             <div class="col-md-6">
-              <xed:bind xpath="@xml:lang" initially="de">
                 <xed:include ref="lang.list" />
-              </xed:bind>
             </div>
+          </xed:bind>
           </div>
         </div>
       </xed:repeat>
@@ -483,7 +483,7 @@
       <div class="mir-form-group row">
         <div class="col-md-3">
           <xed:bind xpath="@eventType" default="creation">
-            <select aria-label="Select date type" class="form-control form-control-inline date-select form-select">
+            <select aria-label="Select date type" id="_date" class="form-control form-control-inline date-select form-select">
               <option value="creation">
                 <xed:output i18n="mir.date.created" />
               </option>
@@ -940,7 +940,7 @@
             <xed:output i18n="mir.date.issued.range" />
           </label>
           <div class="col-md-6 center-vertical">
-            <mir:dateRangeInput id="{@label}_date" xpath="mods:originInfo[@eventType='publication']/mods:dateIssued[@encoding='w3cdtf']" class="datetimepicker mainDate"
+            <mir:dateRangeInput xpath="mods:originInfo[@eventType='publication']/mods:dateIssued[@encoding='w3cdtf']" class="datetimepicker mainDate"
               placeholder="{i18n:mir.placeholder.date}" type="publication" startsWithDateTime="false" showDateTimeOption="false"/>
             <span class="fas fa-chevron-down expand-item" title="{i18n:mir.help.expand}" aria-hidden="true"></span>
           </div>
@@ -1399,24 +1399,24 @@
 
   <xed:template id="language">
     <xed:repeat xpath="mods:language" max="5">
+      <xed:bind xpath="mods:languageTerm[@authority='rfc5646'][@type='code']" initially="de">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label id="lang_list" class="col-md-3 col-form-label text-end form-label">
+        <label for="{concat(xed:generate-id(), '_lang')}" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.language" />
         </label>
-        <div class="col-md-6">
-          <xed:bind xpath="mods:languageTerm[@authority='rfc5646'][@type='code']" initially="de">
+        <div class="col-md-6">          
             <div class="controls">
-              <xed:include ref="lang.list" />
+              <xed:include ref="lang.list"/>
             </div>
-          </xed:bind>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.language}" pmud="true" />
-      </div>
+      </div>      
+    </xed:bind>
     </xed:repeat>
   </xed:template>
 
   <xed:template id="lang.list">
-    <select aria-labelledby="lang_list" aria-label="Select a language" class="form-control form-control-inline lang-select form-select" data-dlang="{$MCR.Metadata.DefaultLang}" data-langs="{$MCR.Metadata.Languages}">
+    <select id="{concat(xed:generate-id(), '_lang')}" aria-label="Select a language" class="form-control form-control-inline lang-select form-select" data-dlang="{$MCR.Metadata.DefaultLang}" data-langs="{$MCR.Metadata.Languages}">
       <xed:choose>
         <xed:when test="string-length(.) &gt; 0">
           <option value="{.}" selected="">
@@ -1744,17 +1744,17 @@
       </legend>
       <xed:repeat xpath="mods:abstract" min="1" max="3">
         <div class="mir-fieldset-content">
+          <xed:bind xpath="@xml:lang" initially="de">
           <div class="mir-form-group row">
-            <label class="col-md-3 col-form-label text-end form-label">
+            <label for="{concat(xed:generate-id(), '_lang')}" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="mir.abstract.in" />
             </label>
             <div class="col-md-6">
-              <xed:bind xpath="@xml:lang" initially="de">
                 <xed:include ref="lang.list" />
-              </xed:bind>
             </div>
             <mir:help-pmud help-text="{i18n:mir.help.abstract.language}" pmud="true" />
           </div>
+        </xed:bind>
           <mir:textfield xpath="@xlink:href" label="mir.placeholder.abstract.link" help-text="{i18n:mir.help.abstract.aslink}" placeholder="{i18n:mir.placeholder.abstract.link}" />
           <mir:htmlArea xpath="." label="mir.abstract.ortext" help-text="{i18n:mir.help.abstract.ortext}" rows="5" />
         </div>
@@ -1770,7 +1770,7 @@
   <xed:template id="geographicAndCartographics">
     <xed:repeat xpath="mods:subjectGEO" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="{xed:generate-id()}_geographicAndCartographics" class="col-md-3 col-form-label text-end form-label">
+        <label id="search_form" for="{xed:generate-id()}_geographicAndCartographics" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.geographic" />
         </label>
         <div class="col-md-6">
@@ -1850,11 +1850,11 @@
   <xed:template id="subject.simple">
     <xed:repeat xpath="mods:subjectXML" min="1" max="{$MIR.Editor.repeat.max.subject.simple}">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="search_form" class="col-md-3 col-form-label text-end form-label">
+        <label id="search_form" for="search_form" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic"/>
         </label>
         <div class="col-md-6">
-          <input type="hidden" class="subjectXML"/>
+          <input id="subject.simple" type="hidden" class="subjectXML"/>
           <div id="subject_simple" class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.subject.topic}" pmud="true"/>
@@ -1882,11 +1882,11 @@
   <xed:template id="subject.complex.required">
     <xed:repeat xpath="mods:subjectXML" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="search_form" class="col-md-3 col-form-label text-end form-label">
+        <label id="search_form" for="subject_complex_required" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic.complex "/>
         </label>
         <div class="col-md-6">
-          <input type="hidden" class="subjectXML"/>
+          <input id="subject_complex_required" type="hidden" class="subjectXML"/>
           <div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="*" data-admin="true" data-required="true"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.subject.topic.complex}" pmud="true"/>
@@ -1898,11 +1898,11 @@
   <xed:template id="subject.complex">
     <xed:repeat xpath="mods:subjectXML" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="search_form" class="col-md-3 col-form-label text-end form-label">
+        <label id="search_form" for="subject_complex" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic.complex"/>
         </label>
         <div class="col-md-6">
-          <input type="hidden" class="subjectXML"/>
+          <input id="subject_complex" type="hidden" class="subjectXML"/>
           <div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="*" data-admin="true" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.subject.topic.complex}" pmud="true"/>
@@ -2038,20 +2038,20 @@
       <xed:repeat xpath="mods:note" min="1" max="5">
         <div class="mir-fieldset-content">
           <div class="mir-form-group row">
-            <label for="comment_complex" class="col-md-3 col-form-label text-end form-label">
+            <xed:bind xpath="@type">
+            <label for="{concat(xed:generate-id(), '_comment_complex')}" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="mir.comment.type" />
             </label>
             <div class="col-md-6">
-              <xed:bind xpath="@type">
-                <select id="comment_complex" class="form-control form-select">
+                <select id="{concat(xed:generate-id(), '_comment_complex')}" class="form-control form-select">
                     <option value="">
                       <xed:output i18n="mir.select"/>
                     </option>
                     <xed:include uri="xslStyle:items2options,convertClassificationOptions:classification:editor:-1:children:noteTypes" />
                 </select>
-              </xed:bind >
             </div>
             <mir:help-pmud help-text="{i18n:mir.help.comment.type}" pmud="true" />
+          </xed:bind >
           </div>
           <mir:textarea xpath="." label="mir.comment" help-text="{i18n:mir.help.comment}" rows="3" />
         </div>
diff --git a/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl b/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
index 83ba50fc6b..685d3b6876 100644
--- a/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
+++ b/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
@@ -202,7 +202,7 @@
     <div class="date-format" data-format="simple">
       <div class="date-simple {$hiddenclasssimple} input-group mb-1">
         <xed:bind xpath="{$xpathSimple}">
-          <input id="{@label}_date" type="text" class="form-control {$timeClass}" autocomplete="off">
+          <input id="{@label}_date" aria-labelledby="_date" type="text" class="form-control {$timeClass}" autocomplete="off">
             <xsl:copy-of select="@placeholder" />
           </input>
         </xed:bind>
@@ -556,21 +556,21 @@
   <xsl:template match="mir:insitut.repeated">
     <xsl:variable name="xed-val-marker" > {$xed-validation-marker} </xsl:variable>
     <xed:repeat xpath="mods:name[@type='corporate'][@authorityURI='{$institutesURI}']" min="{@min}" max="{@max}">
+      <xed:bind xpath="@valueURIxEditor">
+      <xsl:variable name="select_id" select="concat(@label,'{xed:generate-id()}')" />
       <div class="mir-form-group row {@class} {$xed-val-marker}">
-        <label or="select institute**TODO**2" class="col-md-3 col-form-label text-end form-label">
+        <label for="{$select_id}" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="{@label}" />
           :
         </label>
         <div class="col-md-6">
           <xed:bind xpath="mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']" initially="his" /><!--  Host institution [his] -->
-          <xed:bind xpath="@valueURIxEditor">
-            <select class="form-control form-control-inline mir-form__js-select--large form-select">
+            <select id="{$select_id}" class="form-control form-control-inline mir-form__js-select--large form-select">
               <option value="">
                 <xed:output i18n="mir.select.optional" />
               </option>
               <xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_institutes" />
             </select>
-          </xed:bind>
         </div>
         <div class="col-md-3">
           <xsl:if test="string-length(@help-text) &gt; 0">
@@ -579,6 +579,7 @@
           <xsl:call-template name="mir-pmud" />
         </div>
       </div>
+    </xed:bind>
     </xed:repeat>
   </xsl:template>
 
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/repeater.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/repeater.vue
index fcd41c1407..c126a2f37d 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/repeater.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/repeater.vue
@@ -28,6 +28,7 @@
                 :title="props.upTitle"
                 :class="`btn btn-sm btn-secondary${upEnabled? '':' disabled'}`"
                 type="button"
+                aria-label="up botton"
                 v-on:click.prevent="upClicked()">
             <i class="fas fa-arrow-up fa-fw"/>
         </button>
@@ -35,6 +36,7 @@
                 :title="props.downTitle"
                 :class="`btn btn-sm btn-secondary${downEnabled? '':' disabled'}`"
                 type="button"
+                aria-label="down button"
                 v-on:click.prevent="downClicked()">
             <i class="fas fa-arrow-down fa-fw"/>
         </button>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue b/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue
index efc8505ca1..3ca77d8149 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue
@@ -2,7 +2,7 @@
     <form>
         <div class="mir-form-group">
             <div class="input-group input-group-sm mb-3">
-                <input id="search_form" v-model="model.inputValue" :disabled="searchEnabled?null:''" @submit.prevent type="text" :placeholder="i18n['mir.editor.subject.search.placeholder']" class="form-control search-topic">
+                <input aria-labelledby="search_form" v-model="model.inputValue" :disabled="searchEnabled?null:''" @submit.prevent type="text" :placeholder="i18n['mir.editor.subject.search.placeholder']" class="form-control search-topic">
                 <button class="btn btn-sm btn-primary" type="submit" :disabled="searchEnabled?null:''" @click.prevent="search" >{{ i18n['mir.editor.subject.search'] }}</button>
             </div>
         </div>

From 07bf911810e0810a6caba2eb64e7584d4e3d8ddd Mon Sep 17 00:00:00 2001
From: Ahmad Obeid <obeid@fh-aachen.de>
Date: Fri, 20 Jun 2025 11:38:31 +0200
Subject: [PATCH 3/6] accessibility_issues_solve_merge_conflict

---
 .../resources/bootswatch-default.html         |   2 +-
 .../META-INF/resources/template-chooser.xml   |   4 +-
 .../resources/xsl/mir-cosmol-layout-utils.xsl |   6 +-
 .../main/resources/xsl/mir-cosmol-layout.xsl  |   2 +-
 .../xsl/mir-flatmir-layout-utils.xsl          |   6 +-
 .../authorization/new-author-includes.xed     |   2 +-
 .../resources/content/publish/index.xml       |   2 -
 .../resources/content/search/complex.xed      |   2 +-
 .../content/search/complex_intern.xed         |  16 +-
 .../resources/content/search/simple.xed       |   2 +-
 .../content/search/simple_intern.xed          |   2 +-
 .../resources/editor/change_genre.xed         |   2 +-
 .../resources/editor/editor-admins.xed        |   2 +-
 .../resources/editor/editor-dynamic.xed       |   2 +-
 .../resources/editor/editor-includes.xed      | 173 ++++++++++--------
 .../META-INF/resources/js/mir/xeditor-form.js |  13 +-
 .../src/main/resources/xsl/datatable.xsl      |   2 +-
 .../main/resources/xsl/editor/mir2xeditor.xsl |  17 +-
 .../resources/xsl/metadata/mir-citation.xsl   |   5 +-
 .../resources/xsl/modsdetails-external.xsl    |   4 +-
 .../main/resources/xsl/response-facets.xsl    |   9 +-
 .../src/main/resources/xsl/response-mir.xsl   |   6 +-
 .../main/resources/xsl/response-person.xsl    |   1 -
 .../xslt/metadata/mods-metadata-page.xsl      |   1 -
 .../src/components/editor/array-repeater.vue  |  11 ++
 .../components/editor/cartographic-editor.vue |  14 +-
 .../src/components/search/search-form.vue     |  15 +-
 .../src/main/vue/name-search/src/App.vue      |   2 +-
 .../META-INF/resources/wizard/index.xed       |   2 +-
 29 files changed, 182 insertions(+), 145 deletions(-)

diff --git a/mir-layout/src/main/resources/META-INF/resources/bootswatch-default.html b/mir-layout/src/main/resources/META-INF/resources/bootswatch-default.html
index 7e36667c5e..b6c3ba7d57 100644
--- a/mir-layout/src/main/resources/META-INF/resources/bootswatch-default.html
+++ b/mir-layout/src/main/resources/META-INF/resources/bootswatch-default.html
@@ -1272,7 +1272,7 @@ <h4 class="modal-title">Source Code</h4>
     </div>
 
 
-    <script type="text/javascript" src="webjars/jquery/1.11.3/jquery.min.js"></script>
+    <script src="webjars/jquery/1.11.3/jquery.min.js"></script>
     <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="../assets/js/bootswatch.js"></script>
   </body>
diff --git a/mir-layout/src/main/resources/META-INF/resources/template-chooser.xml b/mir-layout/src/main/resources/META-INF/resources/template-chooser.xml
index bbca1a6791..d38bc38f71 100644
--- a/mir-layout/src/main/resources/META-INF/resources/template-chooser.xml
+++ b/mir-layout/src/main/resources/META-INF/resources/template-chooser.xml
@@ -4,7 +4,7 @@
   <section xml:lang="de" title="Layout wechseln">
     <h1>Template Chooser</h1>
     <div class="row">
-      <form role="form" method="post" name="templateChooser" class="form-horizontal col-sm-5">
+      <form method="post" name="templateChooser" class="form-horizontal col-sm-5">
         <div class="form-group">
           <label for="layout" class="col-sm-6 control-label">Layout β</label>
           <div class="col-sm-6">
@@ -65,7 +65,7 @@
       }
     ]]>
     </style>
-    <script type="text/javascript">
+    <script>
     <![CDATA[
       "use strict";
       (function($) {
diff --git a/mir-layout/src/main/resources/xsl/mir-cosmol-layout-utils.xsl b/mir-layout/src/main/resources/xsl/mir-cosmol-layout-utils.xsl
index 859490e918..c6f296e9f1 100644
--- a/mir-layout/src/main/resources/xsl/mir-cosmol-layout-utils.xsl
+++ b/mir-layout/src/main/resources/xsl/mir-cosmol-layout-utils.xsl
@@ -110,9 +110,9 @@
         <div class="col-2">
           <h4>Netzwerke</h4>
           <ul class="social_links">
-            <li><a href="#"><button type="button" class="social_icons social_icon_fb" aria-label="Facebook"></button>Facebook</a></li>
-            <li><a href="#"><button type="button" class="social_icons social_icon_tw" aria-label="Twitter"></button>Twitter</a></li>
-            <li><a href="#"><button type="button" class="social_icons social_icon_gg" aria-label="Google+"></button>Google+</a></li>
+            <li><button type="button" aria-label="Facebook" class="social_icons social_icon_fb" onclick="window.open('https://facebook.com', '_blank')">Twitter</button></li>
+            <li><button type="button" aria-label="Twitter" class="social_icons social_icon_tw" onclick="window.open('https://twitter.com', '_blank')">Twitter</button></li>
+            <li><button type="button" aria-label="Google+" class="social_icons social_icon_gg" onclick="window.open('https://plus.google.com', '_blank')">Google+</button></li>
           </ul>
         </div>
         <div class="col-2">
diff --git a/mir-layout/src/main/resources/xsl/mir-cosmol-layout.xsl b/mir-layout/src/main/resources/xsl/mir-cosmol-layout.xsl
index 32088e5b94..5381c6ea4f 100644
--- a/mir-layout/src/main/resources/xsl/mir-cosmol-layout.xsl
+++ b/mir-layout/src/main/resources/xsl/mir-cosmol-layout.xsl
@@ -33,7 +33,7 @@
         <script src="{$WebApplicationBaseURL}mir-layout/assets/jquery/plugins/jquery-migrate/jquery-migrate.min.js"></script>
         <xsl:copy-of select="head/*" />
         <link href="{$WebApplicationBaseURL}rsc/sass/mir-layout/scss/{$MIR.Layout.Theme}-{$MIR.DefaultLayout.CSS}.css" rel="stylesheet" />
-        <script type="text/javascript" src ="{$WebApplicationBaseURL}mir-layout/js/cosmol.js"></script>
+        <script src ="{$WebApplicationBaseURL}mir-layout/js/cosmol.js"></script>
         <xsl:if test="string-length($MIR.CustomLayout.CSS) &gt; 0">
           <link href="{$WebApplicationBaseURL}css/{$MIR.CustomLayout.CSS}" rel="stylesheet" />
         </xsl:if>
diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
index 328a7de39c..3e07bd7a88 100644
--- a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
+++ b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
@@ -150,9 +150,9 @@
         <div class="col-2">
           <h4>Netzwerke</h4>
           <ul class="social_links">
-            <li><a href="#"><button type="button" class="social_icons social_icon_fb" aria-label="Facebook"></button>Facebook</a></li>
-            <li><a href="#"><button type="button" class="social_icons social_icon_tw" aria-label="Twitter"></button>Twitter</a></li>
-            <li><a href="#"><button type="button" class="social_icons social_icon_gg" aria-label="Google+"></button>Google+</a></li>
+            <li><button type="button" aria-label="Facebook" class="social_icons social_icon_fb" onclick="window.open('https://facebook.com', '_blank')">Facebook</button></li>
+            <li><button type="button" aria-label="Twitter" class="social_icons social_icon_tw" onclick="window.open('https://twitter.com', '_blank')">Twitter</button></li>
+            <li><button type="button" aria-label="Google+" class="social_icons social_icon_gg" onclick="window.open('https://plus.google.com', '_blank')">Google+</button></li>
           </ul>
         </div>
         <div class="col-2">
diff --git a/mir-module/src/main/resources/META-INF/resources/authorization/new-author-includes.xed b/mir-module/src/main/resources/META-INF/resources/authorization/new-author-includes.xed
index 9c575f1c2f..fe9eece98d 100644
--- a/mir-module/src/main/resources/META-INF/resources/authorization/new-author-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/authorization/new-author-includes.xed
@@ -24,7 +24,7 @@
   <xed:template id="captcha">
     <xed:if test="string-length($MIR.ReCaptcha.site.key) &gt; 0">
       <script src='https://www.google.com/recaptcha/api.js' />
-      <script type="text/javascript">
+      <script>
       <![CDATA[
           var verifyCallback = function(response) {
             $('#my-g-recaptcha-response').val(response);
diff --git a/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml b/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml
index 97831f66e9..3e0638e923 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml
+++ b/mir-module/src/main/resources/META-INF/resources/content/publish/index.xml
@@ -11,7 +11,6 @@
 
     <form id="submit_publication"
           class="form-horizontal"
-          role="form"
           method="get"
           action="../../editor/editor-dynamic.xed">
 
@@ -89,7 +88,6 @@
 
     <form id="submit_publication"
           class="form-horizontal"
-          role="form"
           method="get"
           action="../../editor/editor-dynamic.xed">
 
diff --git a/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed b/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed
index dd9411c84b..8743cdcdab 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed
+++ b/mir-module/src/main/resources/META-INF/resources/content/search/complex.xed
@@ -16,7 +16,7 @@
 
   <section xml:lang="all" xmlns:xed="http://www.mycore.de/xeditor"  xmlns:mir="http://www.mycore.de/mir"
            i18n="component.mods.editor.search.complex.pagetitle">
-    <xed:form class="form-horizontal" role="form">
+    <xed:form class="form-horizontal">
       <xed:cleanup-rule xpath="//condition" relevant-if="(string-length(@value) &gt; 0) or value[string-length(text()) &gt; 0 ]" />
       <xed:cleanup-rule xpath="//boolean" relevant-if="boolean|condition" />
       <xed:cleanup-rule xpath="//condition[@selectable='true']" relevant-if="@id = ../selectCondition/@keep" />
diff --git a/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed b/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed
index 920e9cb5b2..ad605cf4c4 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed
+++ b/mir-module/src/main/resources/META-INF/resources/content/search/complex_intern.xed
@@ -16,7 +16,7 @@
 
  <section xml:lang="all" xmlns:xed="http://www.mycore.de/xeditor" xmlns:mir="http://www.mycore.de/mir"
           i18n="component.mods.editor.search.complex.pagetitle">
-    <xed:form class="form-horizontal" role="form">
+    <xed:form class="form-horizontal">
       <xed:cleanup-rule xpath="//condition" relevant-if="(string-length(@value) &gt; 0) or value[string-length(text()) &gt; 0 ]" />
       <xed:cleanup-rule xpath="//boolean" relevant-if="boolean|condition" />
       <xed:cleanup-rule xpath="//condition[@selectable='true']" relevant-if="@id = ../selectCondition/@keep" />
@@ -90,31 +90,31 @@
                   </xed:repeat>
                   <!-- Identifier -->
                   <mir:template name="textInput"
-                    xpath="condition[@field='id,isbn,mods.identifier']/@value" id="inputIdentifier1"
+                    xpath="condition[@field='id,isbn,mods.identifier']/@value" id="{xed:generate-id()}_inputIdentifier1"
                     i18n="editor.search.mir.identifier" tooltip="editor.search.mir.identifier.tooltip" />
                   <!-- Institution -->
                   <mir:template name="selectInput"
-                    xpath="condition[@field='category.top'][1]/@value" id="inputInst1"
+                    xpath="condition[@field='category.top'][1]/@value" id="{xed:generate-id()}_inputInst1"
                     i18n="editor.search.mir.institute" tooltip="editor.search.mir.institute.tooltip"
                     uri="xslStyle:items2options:classification:editorComplete:-1:children:mir_institutes" />
                   <!-- DNB Sachgruppe -->
                   <mir:template name="selectInput"
-                    xpath="condition[@field='category.top'][2]/@value" id="inputSDNB1"
+                    xpath="condition[@field='category.top'][2]/@value" id="{xed:generate-id()}_inputSDNB1"
                     i18n="editor.search.mir.sdnb" tooltip="editor.search.mir.sdnb.tooltip"
                     uri="xslStyle:items2options:classification:editorComplete:-1:children:SDNB" />
                   <!-- Genre -->
                   <mir:template name="selectInput"
-                    xpath="condition[@field='category.top'][3]/@value" id="inputGenre1"
+                    xpath="condition[@field='category.top'][3]/@value" id="{xed:generate-id()}_inputGenre1"
                     i18n="editor.search.mir.genre" tooltip="editor.search.genre.tooltip"
                     uri="xslStyle:items2options?allSelectable=true:classification:editorComplete:-1:children:mir_genres" />
                   <!-- Licenses -->
                   <mir:template name="selectInput"
-                    xpath="condition[@field='category.top'][4]/@value" id="inputLicense1"
+                    xpath="condition[@field='category.top'][4]/@value" id="{xed:generate-id()}_inputLicense1"
                     i18n="editor.search.mir.license" tooltip="editor.search.license.tooltip"
                     uri="xslStyle:items2options:classification:editorComplete:-1:children:mir_licenses" />
                   <!-- Status -->
                   <mir:template name="selectInput"
-                    xpath="condition[@field='state']/@value" id="inputStatus1"
+                    xpath="condition[@field='state']/@value" id="{xed:generate-id()}_inputStatus1"
                     i18n="editor.search.status" tooltip="editor.search.status.tooltip"
                     uri="xslStyle:items2options:classification:editor:-1:children:state" />
                   <!-- Datum -->
@@ -241,7 +241,7 @@
           <div class="card-footer clearfix">
             <div class="float-end">
               <mir:template name="submitButton" i18n="editor.search.search"
-                target="servlet_MCRQLSearchServlet" order="primary-button"/>
+                target="servlet_MCRQLSearchServlet"/>
             </div>
           </div>
         </div>
diff --git a/mir-module/src/main/resources/META-INF/resources/content/search/simple.xed b/mir-module/src/main/resources/META-INF/resources/content/search/simple.xed
index e047eb2a46..05ae201862 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/search/simple.xed
+++ b/mir-module/src/main/resources/META-INF/resources/content/search/simple.xed
@@ -17,7 +17,7 @@
   <section xml:lang="all" xmlns:xed="http://www.mycore.de/xeditor" xmlns:mir="http://www.mycore.de/mir"
       i18n="component.mods.editor.search.simple.pagetitle">
 
-    <xed:form class="form-horizontal" role="form">
+    <xed:form class="form-horizontal">
       <xed:cleanup-rule xpath="//condition" relevant-if="(string-length(@value) &gt; 0) or value[string-length(text()) &gt; 0 ]" />
       <xed:cleanup-rule xpath="//boolean" relevant-if="boolean|condition" />
       <xed:cleanup-rule xpath="//condition[@selectable='true']" relevant-if="@id = ../selectCondition/@keep" />
diff --git a/mir-module/src/main/resources/META-INF/resources/content/search/simple_intern.xed b/mir-module/src/main/resources/META-INF/resources/content/search/simple_intern.xed
index dc3cc82abb..2871b4529b 100644
--- a/mir-module/src/main/resources/META-INF/resources/content/search/simple_intern.xed
+++ b/mir-module/src/main/resources/META-INF/resources/content/search/simple_intern.xed
@@ -17,7 +17,7 @@
   <section xml:lang="all" xmlns:xed="http://www.mycore.de/xeditor" xmlns:mir="http://www.mycore.de/mir"
       i18n="component.mods.editor.search.simple.pagetitle">
 
-    <xed:form class="form-horizontal" role="form">
+    <xed:form class="form-horizontal">
       <xed:cleanup-rule xpath="//condition" relevant-if="(string-length(@value) &gt; 0) or value[string-length(text()) &gt; 0 ]" />
       <xed:cleanup-rule xpath="//boolean" relevant-if="boolean|condition" />
       <xed:cleanup-rule xpath="//condition[@selectable='true']" relevant-if="@id = ../selectCondition/@keep" />
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/change_genre.xed b/mir-module/src/main/resources/META-INF/resources/editor/change_genre.xed
index a841ad588b..b23f12b9ff 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/change_genre.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/change_genre.xed
@@ -6,7 +6,7 @@
     <h2>Genre ändern</h2>
     <p>Bitte geben Sie das korrekte Genre für die Publikation xy an:</p>
 
-    <xed:form xmlns:xed="http://www.mycore.de/xeditor" role="form" class="form-horizontal">
+    <xed:form xmlns:xed="http://www.mycore.de/xeditor" class="form-horizontal">
       <xed:source uri="xslStyle:mods2editor:xslStyle:asParent:mcrobject:{$parentId}" />
       <xed:source uri="xslStyle:mods2editor:xslStyle:mycoreobject-editor:mcrobject:{$id}" />
       <xed:cancel url="servlets/MCRLockServlet?action=unlock&amp;id={$id}&amp;url=/receive/{$id}" />
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-admins.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-admins.xed
index 4979dae86c..f482280c3f 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-admins.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-admins.xed
@@ -5,7 +5,7 @@
   <section title="Create MODS document" xml:lang="en"/>
   <section xml:lang="all">
 
-  <xed:form xmlns:xed="http://www.mycore.de/xeditor" xmlns:cmd="http://www.cdlib.org/inside/diglib/copyrightMD" method="post" role="form" class="form-horizontal">
+  <xed:form xmlns:xed="http://www.mycore.de/xeditor" xmlns:cmd="http://www.cdlib.org/inside/diglib/copyrightMD" method="post" class="form-horizontal">
 
     <xed:preload uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-includes.xed" />
     <xed:preload uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-admins-includes.xed" />
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-dynamic.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-dynamic.xed
index 29ed2f4dec..18b20ae09a 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-dynamic.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-dynamic.xed
@@ -5,7 +5,7 @@
   <section title="Create MODS document" xml:lang="en"/>
   <section xml:lang="all">
 
-  <xed:form xmlns:xed="http://www.mycore.de/xeditor" xmlns:cmd="http://www.cdlib.org/inside/diglib/copyrightMD" method="post" role="form" class="form-horizontal" id="dynamic_editor">
+  <xed:form xmlns:xed="http://www.mycore.de/xeditor" xmlns:cmd="http://www.cdlib.org/inside/diglib/copyrightMD" method="post" class="form-horizontal" id="dynamic_editor">
 
     <xed:preload uri="xslStyle:editor/mir2xeditor:webapp:editor/editor-includes.xed" />
     <xed:preload uri="webapp:editor/editor-genres.xed" />
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index 6f63a8b45c..3580c7c240 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -38,7 +38,7 @@
     <input type="hidden" name="XSL.Status.Style" value="success" />
   </xed:template>
 
-  <xed:template id="genre.base">   
+  <xed:template id="genre.base">
     <label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
       <xed:output i18n="component.mods.genre" />
     </label>
@@ -302,14 +302,13 @@
       <xed:repeat xpath="mods:titleInfo" min="1" max="6">
         <div class="mir-fieldset-content">
           <div class="mir-form-group row">
-            <xed:bind xpath="mods:nonSort"><label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
+            <xed:bind xpath="mods:nonSort">
+            <label for="{xed:generate-id()}_der" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="mir.title.nonSort" />
             </label></xed:bind><!-- **TODO einrücken-->
             <div class="col-md-6">
               <div class="form-inline controls">
-                <xed:bind xpath="mods:nonSort">
-                  <input id="{xed:generate-id()}" type="text" size="9" class="form-control form-control-inline" placeholder="Der/Die/Das" />
-                </xed:bind>
+                  <input id="{xed:generate-id()}_der" type="text" size="9" class="form-control form-control-inline" placeholder="Der/Die/Das" />
                 <xed:bind xpath="@xml:lang" initially="de">
                   <xed:include ref="lang.list" />
                 </xed:bind>
@@ -334,6 +333,7 @@
                 </xed:bind>
               </div>
             </div>
+          </xed:bind>
             <mir:help-pmud help-text="{i18n:mir.help.title.complex}" pmud="true" />
           </div>
           <mir:textarea xpath="mods:title" rows="2" label="mir.title" help-text="{i18n:mir.help.title}" />
@@ -655,22 +655,22 @@
   <xed:template id="authorSpecification.repeated">
     <xed:repeat xpath="mods:role/mods:roleTerm[@authorityURI='https://www.mycore.de/classifications/author_roles']" min="1">
       <div class="mir-form-group row authorSpecification">
-        <xed:bind xpath="@valueURIxEditor"><label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
+        <xed:bind xpath="@valueURIxEditor">
+          <label for="{xed:generate-id()}_authorSpecification" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.editor.person.authorSpecification" />
         </label> </xed:bind> <!--**TODO einrücken-->     
         <div class="col-md-6">
           <div class="controls">
-            <xed:bind xpath="@valueURIxEditor">
-              <select id="{xed:generate-id()}" class="form-control form-control-inline form-select">
+              <select id="{xed:generate-id()}_authorSpecification" class="form-control form-control-inline form-select">
                 <option value="">
                   <xed:output i18n="mir.select.optional" />
                 </option>
                 <xed:include uri="xslStyle:items2options:classification:editor:-1:children:author_roles" />
               </select>
-            </xed:bind>
           </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.authorSpecification}" pmud="true" />
+            </xed:bind>
       </div>
     </xed:repeat>
   </xed:template>
@@ -934,7 +934,12 @@
 
   <xed:template id="date.range.extended.datetimepicker">
     <fieldset class="dateExtended_box">
-      <legend class="mir-fieldset-legend hiddenDetail">
+      <legend class="mir-fieldset-legend hiddenDetail d-flex justify-content-between align-items-center">
+        <span>
+          **TODO i18n <xed:output i18n="mir.date.issued.range" />
+        </span>
+      </legend>
+      
         <div class="mir-form-group row datetimepicker {$xed-validation-marker}">
           <label for="{@label}_date" class="col-md-3 col-form-label text-end form-label">
             <xed:output i18n="mir.date.issued.range" />
@@ -946,7 +951,6 @@
           </div>
           <mir:help-pmud help-text="{i18n:mir.help.date.issued.10}" pmud="false" />
         </div>
-      </legend>
       <div class="mir-fieldset-content dateExtended-container d-none">
         <mir:dateRange xpath="mods:originInfo[@eventType='creation']/mods:dateCreated[@encoding='w3cdtf']" help-text="{i18n:mir.help.date.created.range}"
           class="datetimepicker" placeholder="{i18n:mir.placeholder.date}" label="mir.date.created.range" />
@@ -1360,6 +1364,7 @@
   <xed:template id="host.pages">
     <xed:bind xpath="mods:part/mods:extent[@unit='pages']/mods:list">
     <div class="mir-form-group row mir-modspart">
+      <xed:bind xpath="mods:part/mods:extent[@unit='pages']/mods:list">
       <label for="{xed:generate-id()}_host_pages" class="col-md-3 col-form-label text-end form-label">
         <xed:output i18n="mir.pages" />:
       </label>
@@ -1368,6 +1373,7 @@
             <input id="{xed:generate-id()}_host_pages" type="text" size="20" class="form-control form-control-inline" />
         </div>
       </div>
+    </xed:bind>
       <mir:help-pmud help-text="{i18n:mir.help.host.pages}" />
     </div>
   </xed:bind>
@@ -1376,15 +1382,17 @@
   <xed:template id="host.order">
     <xed:bind xpath="mods:part/@order">
     <div class="mir-form-group row mir-modspart">
-      <label for="{xed:generate-id()}_host_order" class="col-md-3 col-form-label text-end form-label">
-        <xed:output i18n="mir.order" />:
-      </label>
-      <div class="col-md-6">
-        <div class="form-inline">
+      <xed:bind xpath="mods:part/@order">
+        <label for="{xed:generate-id()}_host_order" class="col-md-3 col-form-label text-end form-label">
+          <xed:output i18n="mir.order" />:
+        </label>
+        <div class="col-md-6">
+          <div class="form-inline">
             <input id="{xed:generate-id()}_host_order" type="text" size="20" class="form-control form-control-inline {$xed-validation-marker}" />
+          </div>
         </div>
-      </div>
-      <mir:help-pmud help-text="{i18n:mir.help.host.order}" />
+        <mir:help-pmud help-text="{i18n:mir.help.host.order}" />
+      </xed:bind>
     </div>
   </xed:bind>
   </xed:template>
@@ -1401,22 +1409,23 @@
     <xed:repeat xpath="mods:language" max="5">
       <xed:bind xpath="mods:languageTerm[@authority='rfc5646'][@type='code']" initially="de">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="{concat(xed:generate-id(), '_lang')}" class="col-md-3 col-form-label text-end form-label">
-          <xed:output i18n="mir.language" />
-        </label>
-        <div class="col-md-6">          
+        <xed:bind xpath="mods:languageTerm[@authority='rfc5646'][@type='code']" initially="de">
+          <label for="{xed:generate-id()}_lang" class="col-md-3 col-form-label text-end form-label">
+            <xed:output i18n="mir.language" />
+          </label>
+          <div class="col-md-6">
             <div class="controls">
               <xed:include ref="lang.list"/>
             </div>
-        </div>
-        <mir:help-pmud help-text="{i18n:mir.help.language}" pmud="true" />
-      </div>      
-    </xed:bind>
+          </div>
+          <mir:help-pmud help-text="{i18n:mir.help.language}" pmud="true" />
+        </xed:bind>
+      </div>
     </xed:repeat>
   </xed:template>
 
   <xed:template id="lang.list">
-    <select id="{concat(xed:generate-id(), '_lang')}" aria-label="Select a language" class="form-control form-control-inline lang-select form-select" data-dlang="{$MCR.Metadata.DefaultLang}" data-langs="{$MCR.Metadata.Languages}">
+    <select id="{xed:generate-id()}_lang" aria-label="Select a language" class="form-control form-control-inline lang-select form-select" data-dlang="{$MCR.Metadata.DefaultLang}" data-langs="{$MCR.Metadata.Languages}">
       <xed:choose>
         <xed:when test="string-length(.) &gt; 0">
           <option value="{.}" selected="">
@@ -1557,27 +1566,27 @@
   </xed:template>
 
   <xed:template id="institutes">
-    <xed:load-resource name="mir_institutes" uri="classification:metadata:-1:children:mir_institutes" />
-    <xed:bind xpath="mods:name[@type='corporate'][@authorityURI=$mir_institutes/label[@xml:lang='x-uri']/@text]">
-    <xed:bind xpath="mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']" initially="his" /><!--  Host institution [his] -->
-    <xed:bind xpath="@valueURIxEditor">
-      <div class="mir-form-group row">
-        <label for="{xed:generate-id()}" class="col-md-3 col-form-label text-right">
+    <div class="mir-form-group row">
+        <xed:load-resource name="mir_institutes" uri="classification:metadata:-1:children:mir_institutes" />
+        <xed:bind xpath="mods:name[@type='corporate'][@authorityURI=$mir_institutes/label[@xml:lang='x-uri']/@text]">
+        <xed:bind xpath="mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']" initially="his" /><!--  Host institution [his] -->
+        <xed:bind xpath="@valueURIxEditor">
+        <label for="{xed:generate-id()}_institutes" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.institution" />
           :
         </label>
         <div class="col-md-6">
-          <select id="{xed:generate-id()}" class="form-control form-control-inline mir-form__js-select--large">
+          <select id="{xed:generate-id()}_institutes" class="form-control form-control-inline mir-form__js-select--large form-select">
             <option value="">
               <xed:output i18n="mir.select.optional" />
             </option>
             <xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_institutes" />
           </select>
-        </div>
-        <mir:help-pmud help-text="{i18n:mir.help.institutes}" />
       </div>
-    </xed:bind>
-    </xed:bind>  
+      <mir:help-pmud help-text="{i18n:mir.help.institutes}" />
+          </xed:bind>
+        </xed:bind>
+    </div>
   </xed:template>
 
   <xed:template id="institutes.repeat">
@@ -1746,13 +1755,15 @@
         <div class="mir-fieldset-content">
           <xed:bind xpath="@xml:lang" initially="de">
           <div class="mir-form-group row">
-            <label for="{concat(xed:generate-id(), '_lang')}" class="col-md-3 col-form-label text-end form-label">
-              <xed:output i18n="mir.abstract.in" />
-            </label>
-            <div class="col-md-6">
+            <xed:bind xpath="@xml:lang" initially="de">
+              <label for="{xed:generate-id()}_lang" class="col-md-3 col-form-label text-end form-label">
+                <xed:output i18n="mir.abstract.in" />
+              </label>
+              <div class="col-md-6">
                 <xed:include ref="lang.list" />
-            </div>
-            <mir:help-pmud help-text="{i18n:mir.help.abstract.language}" pmud="true" />
+              </div>
+              <mir:help-pmud help-text="{i18n:mir.help.abstract.language}" pmud="true" />
+          </xed:bind>
           </div>
         </xed:bind>
           <mir:textfield xpath="@xlink:href" label="mir.placeholder.abstract.link" help-text="{i18n:mir.help.abstract.aslink}" placeholder="{i18n:mir.placeholder.abstract.link}" />
@@ -1770,12 +1781,12 @@
   <xed:template id="geographicAndCartographics">
     <xed:repeat xpath="mods:subjectGEO" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label id="search_form" for="{xed:generate-id()}_geographicAndCartographics" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_geographicAndCartographics" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.geographic" />
         </label>
         <div class="col-md-6">
-          <input id="{xed:generate-id()}_geographicAndCartographics" type="hidden" class="subjectXML"/>
-          <div class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic,Cartographic" data-search-filter-default="Geographic" data-admin="geographicPair" data-required="false"> </div>
+          <input type="hidden" class="subjectXML"/>
+          <div data-input-id="{xed:generate-id()}_geographicAndCartographics" class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic,Cartographic" data-search-filter-default="Geographic" data-admin="geographicPair" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.place}" pmud="true"/>
       </div>
@@ -1786,12 +1797,12 @@
   <xed:template id="geographic">
     <xed:repeat xpath="mods:subjectGEO" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="_geographic" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}__geographic" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.geographic" />
         </label>
         <div class="col-md-6">
-          <input id="_geographic" type="hidden" class="subjectXML"/>
-          <div id="_geographic" class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
+          <input type="hidden" class="subjectXML"/>
+          <div data-input-id="{xed:generate-id()}_geographic" class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.place}" pmud="true"/>
       </div>
@@ -1802,12 +1813,12 @@
   <xed:template id="geographic.complex">
     <xed:repeat xpath="mods:subjectGEO" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="geographic_complex" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_geographic_complex" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.geographic" />
         </label>
         <div class="col-md-6">
-          <input id="geographic_complex" type="hidden" class="subjectXML"/>
-          <div id="geographic_complex" class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
+          <input type="hidden" class="subjectXML"/>
+          <div data-input-id="{xed:generate-id()}_geographic_complex" class="editorToolsApp" data-searchable="Geographic" data-editor="Geographic" data-search-filter-default="Geographic" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.place}" pmud="true"/>
       </div>
@@ -1818,12 +1829,12 @@
   <xed:template id="cartographics">
     <xed:bind xpath="mods:subjectGEO">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="_cartographics" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_cartographics" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.cartographics.coordinates" />
         </label>
         <div class="col-md-6">
-          <input id="_cartographics" type="hidden" class="subjectXML"/>
-          <div id="_cartographics" class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
+          <input type="hidden" class="subjectXML"/>
+          <div data-input-id="{xed:generate-id()}_cartographics" class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.coordinates}" pmud="false"/>
       </div>
@@ -1834,12 +1845,12 @@
   <xed:template id="cartographics.repeat">
     <xed:repeat xpath="mods:subjectGEO" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="cartographics_repeat" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_cartographics_repeat" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.cartographics.coordinates" />
         </label>
         <div class="col-md-6">
           <input type="hidden" class="subjectXML"/>
-          <div id="cartographics_repeat" class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
+          <div data-input-id="{xed:generate-id()}_cartographics_repeat" class="editorToolsApp" data-searchable="" data-editor="Cartographics" data-search-filter-default="" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.cartographics.coordinates}" pmud="true"/>
       </div>
@@ -1850,12 +1861,12 @@
   <xed:template id="subject.simple">
     <xed:repeat xpath="mods:subjectXML" min="1" max="{$MIR.Editor.repeat.max.subject.simple}">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label id="search_form" for="search_form" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_subject_simple" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic"/>
         </label>
         <div class="col-md-6">
-          <input id="subject.simple" type="hidden" class="subjectXML"/>
-          <div id="subject_simple" class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="false"> </div>
+          <input type="hidden" class="subjectXML"/>
+          <div data-input-id="{xed:generate-id()}_subject_simple" class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.subject.topic}" pmud="true"/>
       </div>
@@ -1866,12 +1877,12 @@
   <xed:template id="subject.simple.required">
     <xed:repeat xpath="mods:subjectXML" min="1" max="{$MIR.Editor.repeat.max.subject.simple.required}">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label for="subject_simple_required" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_subject_simple_required" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic"/>
         </label>
         <div class="col-md-6">
           <input type="hidden" class="subjectXML"/>
-          <div id="subject_simple_required" class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="true"> </div>
+          <div data-input-id="{xed:generate-id()}_subject_simple_required" class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="Topic" data-admin="false" data-required="true"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.subject.topic}" pmud="true"/>
       </div>
@@ -1882,12 +1893,12 @@
   <xed:template id="subject.complex.required">
     <xed:repeat xpath="mods:subjectXML" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label id="search_form" for="subject_complex_required" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_subject_complex_required" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic.complex "/>
         </label>
         <div class="col-md-6">
-          <input id="subject_complex_required" type="hidden" class="subjectXML"/>
-          <div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="*" data-admin="true" data-required="true"> </div>
+          <input type="hidden" class="subjectXML"/>
+          <div data-input-id="{xed:generate-id()}_subject_complex_required" class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="*" data-admin="true" data-required="true"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.subject.topic.complex}" pmud="true"/>
       </div>
@@ -1898,12 +1909,12 @@
   <xed:template id="subject.complex">
     <xed:repeat xpath="mods:subjectXML" min="1" max="10">
       <div class="mir-form-group row {$xed-validation-marker}">
-        <label id="search_form" for="subject_complex" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_subject_complex" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.subject.topic.complex"/>
         </label>
         <div class="col-md-6">
-          <input id="subject_complex" type="hidden" class="subjectXML"/>
-          <div class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="*" data-admin="true" data-required="false"> </div>
+          <input type="hidden" class="subjectXML"/>
+          <div data-input-id="{xed:generate-id()}_subject_complex" class="editorToolsApp" data-searchable="*" data-editor="*" data-search-filter-default="*" data-admin="true" data-required="false"> </div>
         </div>
         <mir:help-pmud help-text="{i18n:mir.help.subject.topic.complex}" pmud="true"/>
       </div>
@@ -1933,7 +1944,7 @@
         <mir:help-pmud help-text="{i18n:mir.help.classification}" pmud="true" />
       </div>
     </xed:repeat>
-    <script type="text/javascript" src="{$WebApplicationBaseURL}js/mir/classification-modal-select.min.js"></script>
+    <script src="{$WebApplicationBaseURL}js/mir/classification-modal-select.min.js"></script>
   </xed:template>
 
   <xed:template id="modal.body">
@@ -1947,7 +1958,7 @@
           </div>
           <div class="modal-body">
             <div id="modal-searchInput" class="d-flex flex-row-reverse mb-2">
-              <button class="btn btn-primary" aria-label="Search"> 
+              <button class="btn btn-primary" aria-label="Search">
                 <span class="fas fa-search form-control-feedback" />
               </button>
               <input type="text" aria-label="Suche in den Publikationen" placeholder="Suche in den Publikationen" class="form-control" autocomplete="off"/>
@@ -1986,7 +1997,7 @@
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-body">
-            <textarea aria-label="Aria for modal input **TODO**i18n" name="" rows="10" cols="76"></textarea>
+            <textarea aria-label="Aria for modal input **TODO**i18n" name=" " rows="10" cols="76"></textarea>
           </div>
         </div>
       </div>
@@ -2039,19 +2050,19 @@
         <div class="mir-fieldset-content">
           <div class="mir-form-group row">
             <xed:bind xpath="@type">
-            <label for="{concat(xed:generate-id(), '_comment_complex')}" class="col-md-3 col-form-label text-end form-label">
-              <xed:output i18n="mir.comment.type" />
-            </label>
-            <div class="col-md-6">
-                <select id="{concat(xed:generate-id(), '_comment_complex')}" class="form-control form-select">
+              <label for="{xed:generate-id()}_comment_complex" class="col-md-3 col-form-label text-end form-label">
+                <xed:output i18n="mir.comment.type" />
+              </label>
+              <div class="col-md-6">
+                <select id="{xed:generate-id()}_comment_complex" class="form-control form-select">
                     <option value="">
                       <xed:output i18n="mir.select"/>
                     </option>
                     <xed:include uri="xslStyle:items2options,convertClassificationOptions:classification:editor:-1:children:noteTypes" />
                 </select>
-            </div>
-            <mir:help-pmud help-text="{i18n:mir.help.comment.type}" pmud="true" />
-          </xed:bind >
+              </div>
+              </xed:bind >
+              <mir:help-pmud help-text="{i18n:mir.help.comment.type}" pmud="true" />
           </div>
           <mir:textarea xpath="." label="mir.comment" help-text="{i18n:mir.help.comment}" rows="3" />
         </div>
@@ -2381,4 +2392,4 @@
     </script>
   </xed:template>
 
-</xed:template>
+</xed:template>
\ No newline at end of file
diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/xeditor-form.js b/mir-module/src/main/resources/META-INF/resources/js/mir/xeditor-form.js
index 25c783abeb..7346ce6436 100644
--- a/mir-module/src/main/resources/META-INF/resources/js/mir/xeditor-form.js
+++ b/mir-module/src/main/resources/META-INF/resources/js/mir/xeditor-form.js
@@ -359,12 +359,13 @@ $(document).ready(function () {
      }
 
     $("body").on("click", ".expand-item", function () {
-         if($(this).attr("data-target")){
-             $(this).closest(".mir-form-group").next($(this).attr("data-target")).toggleClass("d-none");
-         }
-         else {
-             $(this).closest("legend").toggleClass("hiddenDetail").next().toggleClass("d-none");
-         }
+        const $this = $(this);
+        const $fieldset = $this.closest("fieldset");
+        const $target = $fieldset.find(".mir-fieldset-content, .personExtended-container, .dateExtended-container").first();
+
+        if ($target.length) {
+          $target.toggleClass("d-none");
+        }
          if($(this).hasClass("fa-chevron-down")) {
              $(this).removeClass("fa-chevron-down");
              $(this).addClass("fa-chevron-up");
diff --git a/mir-module/src/main/resources/xsl/datatable.xsl b/mir-module/src/main/resources/xsl/datatable.xsl
index 6b3eb8fa79..3bfd96133f 100644
--- a/mir-module/src/main/resources/xsl/datatable.xsl
+++ b/mir-module/src/main/resources/xsl/datatable.xsl
@@ -165,7 +165,7 @@
 
     <div id="{$id}_wrapper" class="datatable card">
       <div class="card-head clearfix">
-        <form id="{$id}_form" class="row form-inline" role="form">
+        <form id="{$id}_form" class="row form-inline">
           <!-- build hidden values -->
           <xsl:call-template name="dataTableFormValues" />
 
diff --git a/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl b/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
index 685d3b6876..91805176bf 100644
--- a/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
+++ b/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
@@ -394,7 +394,10 @@
     <xed:repeat xpath="mods:name[@type='personal' or not(@type) or (@type='corporate' and not(@authorityURI='{$institutesURI}'))][mods:role/mods:roleTerm[@type='code'][@authority='marcrelator']='{@role}']" min="1" max="100">
       <xed:bind xpath="@type" initially="personal"/>
       <fieldset class="personExtended_box">
-        <legend class="mir-fieldset-legend hiddenDetail">
+        <legend class="mir-fieldset-legend hiddenDetail d-flex justify-content-between align-items-center">
+        <xed:output i18n="{@label}" />
+        <span class="fas fa-chevron-down expand-item" title="{i18n:translate('mir.help.expand')}" data-target=".personExtended-container" role="button" tabindex="0" style="cursor: pointer;" aria-hidden="true"></span>
+        </legend>
           <xed:bind xpath="mods:displayForm"> <!-- Move down to get the "required" validation right -->
             <div class="mir-form-group row {@class} {$xed-val-marker}">
               <xed:bind xpath=".."> <!-- Move up again after validation marker is set -->
@@ -417,7 +420,6 @@
               <xsl:call-template name="mir-required" />
             </div>
           </xed:bind>
-        </legend>
         <div class="mir-fieldset-content personExtended-container d-none">
           <xed:include ref="nameType" />
           <xed:include ref="namePart.repeated" />
@@ -439,7 +441,7 @@
       <xed:bind xpath="mods:displayForm"> <!-- Move down to get the "required" validation right -->
         <div class="mir-form-group row {@class} {$xed-val-marker}">
           <xed:bind xpath=".."> <!-- Move up again after validation marker is set -->
-            <label id="personLabel-" for="personLabel-1-1-" class="col-md-3 col-form-label text-end form-label">
+            <label for="personLabel-1-1-" class="col-md-3 col-form-label text-end form-label">
               <xed:output i18n="{@label}" />
             </label>
             <div class="col-md-6">
@@ -465,13 +467,15 @@
     <xed:repeat xpath="mods:name[@type='personal'  or not(@type) or (@type='corporate' and not(@authorityURI='{$institutesURI}'))]" min="1" max="100">
       <xed:bind xpath="@type" initially="personal"/>
       <fieldset class="personExtended_box">
-        <legend class="mir-fieldset-legend hiddenDetail">
+        <legend class="mir-fieldset-legend hiddenDetail d-flex justify-content-between align-items-center">
+          <span>Autor:in **TODO i18n for legend</span>
+        </legend>
           <xed:bind xpath="mods:displayForm"> <!-- Move down to get the "required" validation right -->
             <div class="mir-form-group row {@class} {$xed-val-marker}">
               <xed:bind xpath=".."> <!-- Move up again after validation marker is set -->
                 <div class="col-md-3" style="text-align:right; font-weight:bold;">
                   <xed:bind xpath="mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']" initially="aut">
-                    <select aria-label="Select role"  id="personLabel-" class="form-control form-control-inline roleSelect form-select">
+                    <select aria-label="Select role" class="form-control form-control-inline roleSelect form-select">
                       <xsl:apply-templates select="*" />
                     </select>
                   </xed:bind>
@@ -489,8 +493,7 @@
                 <xsl:call-template name="mir-required" />
               </xed:bind>
             </div>
-         </xed:bind>
-        </legend>
+         </xed:bind>        
         <div class="mir-fieldset-content personExtended-container d-none">
           <xed:include ref="nameType" />
           <xed:include ref="namePart.repeated" />
diff --git a/mir-module/src/main/resources/xsl/metadata/mir-citation.xsl b/mir-module/src/main/resources/xsl/metadata/mir-citation.xsl
index 4fdf8399c1..d46c24d252 100644
--- a/mir-module/src/main/resources/xsl/metadata/mir-citation.xsl
+++ b/mir-module/src/main/resources/xsl/metadata/mir-citation.xsl
@@ -124,7 +124,7 @@
               <xsl:with-param name="delimiter" select="','" />
             </xsl:call-template>
           </xsl:variable>
-          <select class="form-control input-sm form-select" id="mir-csl-cite"
+          <select aria-label="select Citation style" class="form-control input-sm form-select" id="mir-csl-cite"
                   data-default-selected="{$MIR.defaultCitationStyle}"
                   data-object-id="{/mycoreobject/@ID}">
             <xsl:for-each select="exslt:node-set($cite-styles)/token">
@@ -275,7 +275,6 @@
       class="modal fade"
       tabindex="-1"
       role="dialog"
-      aria-labelledby="modal frame"
       aria-hidden="true">
       <div class="modal-dialog modal-lg modal-xl" role="document">
         <div class="modal-content">
@@ -410,7 +409,7 @@
           <span class="fas fa-copy mir_copy_identifier" data-bs-toggle="tooltip" data-placement="left" aria-hidden="true" title="Copy Identifier"
             data-org-title="Copy Identifier"></span>
         </div>
-        <input type="text" class="d-none mir_identifier_hidden_input" value="{$id}"></input>
+        <input aria-label="Identifier to copy" type="text" class="d-none mir_identifier_hidden_input" value="{$id}"></input>
       </div>
     </xsl:if>
   </xsl:template>
diff --git a/mir-module/src/main/resources/xsl/modsdetails-external.xsl b/mir-module/src/main/resources/xsl/modsdetails-external.xsl
index 05d6dcf15e..7be70391ed 100644
--- a/mir-module/src/main/resources/xsl/modsdetails-external.xsl
+++ b/mir-module/src/main/resources/xsl/modsdetails-external.xsl
@@ -723,7 +723,7 @@
             <button type="button" class="btn btn-secondary modal-pi-cancel" data-bs-dismiss="modal">
               <xsl:value-of select="i18n:translate('component.pi.register.modal.abort')" />
             </button>
-            <button type="button" class="btn btn-danger" id="modal-pi-add"
+            <button type="button" class="btn btn-danger" id="modal-pi-add" aria-label="Register new PI"
                     data-i18n="component.pi.register.">
             </button>
           </div>
@@ -862,7 +862,7 @@
           <!-- no derivate -->
           <xsl:otherwise>
             <!-- show default icon -->
-            <img class="hit_icon" src="{$WebApplicationBaseURL}images/icons/icon_common_disabled.png" />
+            <img alt="" class="hit_icon" src="{$WebApplicationBaseURL}images/icons/icon_common_disabled.png" />
           </xsl:otherwise>
         </xsl:choose>
       </div>
diff --git a/mir-module/src/main/resources/xsl/response-facets.xsl b/mir-module/src/main/resources/xsl/response-facets.xsl
index 919425c343..151a5b01ce 100644
--- a/mir-module/src/main/resources/xsl/response-facets.xsl
+++ b/mir-module/src/main/resources/xsl/response-facets.xsl
@@ -190,16 +190,17 @@
       </xsl:variable>
 
       <li data-fq="{$fqResponseValue}">
-        <div class="form-check" onclick="location.href='{$queryURL}';">
-          <input type="checkbox" class="form-check-input">
+        <xsl:variable name="uniqueID" select="concat('response_value',generate-id())" />
+        <div class="form-check">
+          <input id="{$uniqueID}" type="checkbox" class="form-check-input" onchange="location.href='{$queryURL}';">
             <xsl:if test="
               /response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq' and text() = $fqResponseValue] |
               /response/lst[@name='responseHeader']/lst[@name='params']/arr[@name='fq']/str[text() = $fqResponseValue]">
               <xsl:attribute name="checked">true</xsl:attribute>
             </xsl:if>
           </input>
-
-          <label class="form-check-label form-label">
+            <!--{xed:generate-id()}-->
+          <label for="{$uniqueID}" class="form-check-label form-label">
             <span class="title">
               <xsl:call-template name="label">
                 <xsl:with-param name="parameterValues" select="$parameterValues"/>
diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl
index 272ae2afc8..8f2b78fd03 100644
--- a/mir-module/src/main/resources/xsl/response-mir.xsl
+++ b/mir-module/src/main/resources/xsl/response-mir.xsl
@@ -748,7 +748,7 @@
                 </xsl:when>
                 <!-- when there is no content derivate then use disabled icon -->
                 <xsl:when test="string-length($derivid)=0">
-                  <img class="hit_icon" src="{$WebApplicationBaseURL}images/icons/icon_common_disabled.png"/>
+                  <img alt="" class="hit_icon" src="{$WebApplicationBaseURL}images/icons/icon_common_disabled.png"/>
                 </xsl:when>
                 <xsl:otherwise>
                   <div class="hit_icon"
@@ -873,7 +873,7 @@
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$ServletsBaseURL}solr/mods_nameIdentifier?q=mods.name:&quot;{$author_name}&quot;&amp;owner=createdby:{$owner}" title="Suche nach allen Publikationen">
+                    <a href="{$ServletsBaseURL}solr/mods_nameIdentifier?q=mods.name:&quot;{encoder:encode($author_name, 'UTF-8')}&quot;&amp;owner=createdby:{$owner}" title="Suche nach allen Publikationen">
                       <xsl:value-of select="$author_name" />
                     </a>
                   </xsl:otherwise>
@@ -1169,7 +1169,7 @@
             <xsl:value-of select="i18n:translate('mir.response.button.filter')" />
             <span class="caret" />
           </button>
-          <div class="dropdown-menu dropdown-menu-end stopAutoclose col-md-12 mir-date-arrowTop" role="menu">
+          <div class="dropdown-menu dropdown-menu-end stopAutoclose col-md-12 mir-date-arrowTop">
             <div class="container-fluid">
               <div class="col-md-12 mir-form-group">
                 <select aria-label="select operator" class="form-control form-select">
diff --git a/mir-module/src/main/resources/xsl/response-person.xsl b/mir-module/src/main/resources/xsl/response-person.xsl
index 8e26a749a2..d6cd6dcf4e 100644
--- a/mir-module/src/main/resources/xsl/response-person.xsl
+++ b/mir-module/src/main/resources/xsl/response-person.xsl
@@ -191,7 +191,6 @@
             <h3><xsl:value-of select="i18n:translate('browse.person.searchPerson')" /></h3>
 
             <form class="form-inline"
-                  role="form"
                   id="index_search_form"
                   method="get"
                   action="{$proxyBaseURL}">
diff --git a/mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl b/mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl
index 13ba0297ee..8b1e056d84 100644
--- a/mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl
+++ b/mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl
@@ -93,7 +93,6 @@
                 class="modal fade"
                 tabindex="-1"
                 role="dialog"
-                aria-labelledby="modal frame"
                 aria-hidden="true">
               <div
                   class="modal-dialog modal-lg modal-xl"
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/array-repeater.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/array-repeater.vue
index fac3591b62..5a44dc5b35 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/array-repeater.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/array-repeater.vue
@@ -35,12 +35,22 @@
                 </div>
 
                 <div class="offset-7 col-2">
+                     <!--**TODO button ist hier redundant, kann entfernt werden -->
                     <button :class="`btn btn-sm btn-secondary`"
                             type="button"
                             aria-label="Plus Button"
                             v-on:click.prevent="addChild(0)">
                         <i class="fas fa-plus"/>
                     </button>
+                    <slot name="addButton">
+                        <button class="btn btn-sm btn-secondary"
+                                type="button"
+                                aria-label="Add"
+                                @click.prevent="addChild(0)">
+                          <i class="fas fa-plus"></i>
+                        </button>
+                    </slot>
+                  
                 </div>
             </div>
         </div>
@@ -64,6 +74,7 @@ const emit = defineEmits(['update:modelValue', 'addDefault']);
 const slots = defineSlots<{
     label: { object?: any, index: number }
     displayContent: { object: any, index: number },
+    addButton: {}
 
 }>();
 
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/editor/cartographic-editor.vue b/mir-webapp/src/main/vue/editor-tools/src/components/editor/cartographic-editor.vue
index 30f4e83ac0..845b6205ad 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/editor/cartographic-editor.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/editor/cartographic-editor.vue
@@ -1,8 +1,11 @@
 <template>
   <div>
         <array-repeater v-model="cartographics.scale" default-content="">
+            <template #addButton>
+                <button class="btn btn-sm btn-secondary" @click="cartographics.scale.push('')">Add Scale</button><!--**TODO i18n-->
+            </template>
             <template #label="content">
-                <label :for="content.object ? `${id}scale${content.index}`:null">{{ i18n["mir.editor.subject.cartographics.editor.scale"] }}</label>
+                <label  v-if="content.object !== undefined && content.object !== null" :for="`${id}scale${content.index}`">{{ i18n["mir.editor.subject.cartographics.editor.scale"] }}</label>
             </template>
 
             <template #displayContent="content">
@@ -17,8 +20,11 @@
             </template>
         </array-repeater>
         <array-repeater v-model="cartographics.coordinates" default-content="">
+            <template #addButton>
+                <button class="btn btn-sm btn-secondary" @click="cartographics.coordinates.push('')">Add coordinates</button> <!--**TODO i18n-->
+            </template>
             <template #label="content">
-                <label :for="content.object ? `${id}coordinates${content.index}`:null"> {{ i18n["mir.editor.subject.cartographics.editor.coordinates"] }}</label>
+                <label v-if="content.object !== undefined && content.object !== null" :for=" `${id}coordinates${content.index}`"> {{ i18n["mir.editor.subject.cartographics.editor.coordinates"] }}</label>
             </template>
 
             <template #displayContent="content">
@@ -35,10 +41,10 @@
         <div class="row mt-2">
             <div class="col-12">
                 <div class="btn-group btn-group-sm">
-                    <button class="btn btn-secondary" aria-label="Plus Button" @click.prevent="addPolygon">
+                    <button class="btn btn-secondary" aria-label="add Polygon" @click.prevent="addPolygon">
                         <i class="fas fa-plus"></i> {{ i18n["mir.editor.subject.cartographics.editor.add.polygon"] }}
                     </button>
-                    <button class="btn btn-secondary" aria-label="Plus Button" @click.prevent="addPoint">
+                    <button class="btn btn-secondary" aria-label="add Point" @click.prevent="addPoint">
                         <i class="fas fa-plus"></i> {{ i18n["mir.editor.subject.cartographics.editor.add.point"] }}
                     </button>
                 </div>
diff --git a/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue b/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue
index 3ca77d8149..8a354eec5b 100644
--- a/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue
+++ b/mir-webapp/src/main/vue/editor-tools/src/components/search/search-form.vue
@@ -2,7 +2,7 @@
     <form>
         <div class="mir-form-group">
             <div class="input-group input-group-sm mb-3">
-                <input aria-labelledby="search_form" v-model="model.inputValue" :disabled="searchEnabled?null:''" @submit.prevent type="text" :placeholder="i18n['mir.editor.subject.search.placeholder']" class="form-control search-topic">
+                <input :id="id" v-model="model.inputValue" :disabled="searchEnabled?null:''" @submit.prevent type="text" :placeholder="i18n['mir.editor.subject.search.placeholder']" class="form-control search-topic">
                 <button class="btn btn-sm btn-primary" type="submit" :disabled="searchEnabled?null:''" @click.prevent="search" >{{ i18n['mir.editor.subject.search'] }}</button>
             </div>
         </div>
@@ -11,21 +11,30 @@
 
 <script lang="ts" setup>
 
-import {reactive, defineProps, watch} from "vue";
+import {ref, getCurrentInstance, onMounted, reactive, defineProps, watch} from "vue";
 import {provideTranslations} from "@/api/I18N";
 
 interface SearchFormProps {
     searchEnabled: boolean,
     searchTerm: string,
 }
-
+const id = ref('');
 const emit = defineEmits(["searchSubmitted"]);
 const props = defineProps<SearchFormProps>();
 
 const model = reactive({
     inputValue: "",
 });
+onMounted(() => {
+ const el = getCurrentInstance()?.proxy?.$el as HTMLElement;
+
+  // Suche nach dem nächsten umgebenden container mit der ID
+  const container = el?.closest('.editorToolsApp') as HTMLElement;
 
+  if (container && container.dataset.inputId) {
+    id.value = container.dataset.inputId;
+  } 
+});
 watch(()=> props.searchTerm, (newValue) => {
   model.inputValue = newValue;
 }, {
diff --git a/mir-webapp/src/main/vue/name-search/src/App.vue b/mir-webapp/src/main/vue/name-search/src/App.vue
index e2490fd48c..bc85f4f1cf 100644
--- a/mir-webapp/src/main/vue/name-search/src/App.vue
+++ b/mir-webapp/src/main/vue/name-search/src/App.vue
@@ -4,7 +4,7 @@
       <div ref="input" class="input-group">
         <input :id="`personLabel-${nameLocatorString}`" ref="searchBox" v-model="model.search"
                :placeholder="model.personPlaceholder"
-               aria-labelledby="personLabel-"
+               aria-label="search person"
                class="form-control" type="text"               
                v-on:keydown.enter.prevent="startSearch()">
         <button ref="identifierOpenButton" class="btn btn-secondary"
diff --git a/mir-wizard/src/main/resources/META-INF/resources/wizard/index.xed b/mir-wizard/src/main/resources/META-INF/resources/wizard/index.xed
index 2ab12970b2..7cce1f64b0 100644
--- a/mir-wizard/src/main/resources/META-INF/resources/wizard/index.xed
+++ b/mir-wizard/src/main/resources/META-INF/resources/wizard/index.xed
@@ -12,7 +12,7 @@
   </section>
 
   <section xml:lang="all">
-    <xed:form class="form-horizontal" role="form" xmlns:xed="http://www.mycore.de/xeditor" xmlns:mir="http://www.mycore.de/mir">
+    <xed:form class="form-horizontal" xmlns:xed="http://www.mycore.de/xeditor" xmlns:mir="http://www.mycore.de/mir">
       <xed:bind xpath="wizard">
         <xed:choose>
           <xed:when test="$action = 'login'">

From 1c83736b4ac2e8fa247114f3c56f437973ae7e21 Mon Sep 17 00:00:00 2001
From: Ahmad Obeid <obeid@fh-aachen.de>
Date: Tue, 24 Jun 2025 11:01:27 +0200
Subject: [PATCH 4/6] Stable accessibility version with 25main. Todos:
 aria-label-texts in i18n

---
 .../resources/editor/editor-includes.xed      | 185 +++++++++---------
 1 file changed, 89 insertions(+), 96 deletions(-)

diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index 3580c7c240..115de799db 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -39,12 +39,12 @@
   </xed:template>
 
   <xed:template id="genre.base">
-    <label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
+    <label for="{xed:generate-id()}_base" class="col-md-3 col-form-label text-end form-label">
       <xed:output i18n="component.mods.genre" />
     </label>
     <div class="col-md-6">
       <div class="controls">
-        <select id="{xed:generate-id()}" class="form-control form-control-inline form-select">
+        <select id="{xed:generate-id()}_base" class="form-control form-control-inline form-select">
           <option value="">
             <xed:output i18n="mir.select" />
           </option>
@@ -272,12 +272,12 @@
           <mir:textfield xpath="mods:subTitle" label="mir.title.subTitle" />
           <div class="mir-form-group row">
             <xed:bind xpath="@xml:lang" initially="de">
-            <label for="{concat(xed:generate-id(), '_lang')}" class="col-md-3 col-form-label text-end mir-formgroup-label form-label">
-              <xed:output i18n="mir.language" />
-            </label>
-            <div class="col-md-6">
+              <label for="{xed:generate-id()}_lang" class="col-md-3 col-form-label text-end mir-formgroup-label form-label">
+                <xed:output i18n="mir.language" />
+              </label>
+              <div class="col-md-6">
                 <xed:include ref="lang.list" />
-            </div>
+              </div>
           </xed:bind>
           </div>
         </div>
@@ -303,37 +303,37 @@
         <div class="mir-fieldset-content">
           <div class="mir-form-group row">
             <xed:bind xpath="mods:nonSort">
-            <label for="{xed:generate-id()}_der" class="col-md-3 col-form-label text-end form-label">
-              <xed:output i18n="mir.title.nonSort" />
-            </label></xed:bind><!-- **TODO einrücken-->
-            <div class="col-md-6">
-              <div class="form-inline controls">
+              <label for="{xed:generate-id()}_der" class="col-md-3 col-form-label text-end form-label">
+                <xed:output i18n="mir.title.nonSort" />
+              </label>
+              <div class="col-md-6">
+                <div class="form-inline controls">
                   <input id="{xed:generate-id()}_der" type="text" size="9" class="form-control form-control-inline" placeholder="Der/Die/Das" />
-                <xed:bind xpath="@xml:lang" initially="de">
-                  <xed:include ref="lang.list" />
-                </xed:bind>
-                <xed:bind xpath="@type">
-                  <select aria-label="select title type **TODO**" class="form-control form-control-inline form-select">
-                    <option value="">
-                      <xed:output i18n="mir.title.type.main" />
-                    </option>
-                    <option value="translated">
-                      <xed:output i18n="mir.title.type.translated" />
-                    </option>
-                    <option value="alternative">
-                      <xed:output i18n="mir.title.type.alternative" />
-                    </option>
-                    <option value="abbreviated">
-                      <xed:output i18n="mir.title.type.abbreviated" />
-                    </option>
-                    <option value="uniform">
-                      <xed:output i18n="mir.title.type.uniform" />
-                    </option>
-                  </select>
-                </xed:bind>
+                  <xed:bind xpath="@xml:lang" initially="de">
+                    <xed:include ref="lang.list" />
+                  </xed:bind>
+                  <xed:bind xpath="@type">
+                    <select aria-label="select title type" class="form-control form-control-inline form-select">
+                      <option value="">
+                        <xed:output i18n="mir.title.type.main" />
+                      </option>
+                      <option value="translated">
+                        <xed:output i18n="mir.title.type.translated" />
+                      </option>
+                      <option value="alternative">
+                        <xed:output i18n="mir.title.type.alternative" />
+                      </option>
+                      <option value="abbreviated">
+                        <xed:output i18n="mir.title.type.abbreviated" />
+                      </option>
+                      <option value="uniform">
+                        <xed:output i18n="mir.title.type.uniform" />
+                      </option>
+                    </select>
+                  </xed:bind>
+                </div>
               </div>
-            </div>
-          </xed:bind>
+            </xed:bind>
             <mir:help-pmud help-text="{i18n:mir.help.title.complex}" pmud="true" />
           </div>
           <mir:textarea xpath="mods:title" rows="2" label="mir.title" help-text="{i18n:mir.help.title}" />
@@ -632,12 +632,12 @@
   <xed:template id="nameType">
     <xed:bind xpath="@type" initially="personal">
       <div class="mir-form-group row">
-        <label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_nameType" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="mir.nameType" />
         </label>
         <div class="col-md-6">
           <div class="controls">
-            <select id="{xed:generate-id()}" class="form-control form-control-inline nameType form-select">
+            <select id="{xed:generate-id()}_nameType" class="form-control form-control-inline nameType form-select">
               <option value="personal">
                 <xed:output i18n="mir.nameType.personal" />
               </option>
@@ -657,20 +657,20 @@
       <div class="mir-form-group row authorSpecification">
         <xed:bind xpath="@valueURIxEditor">
           <label for="{xed:generate-id()}_authorSpecification" class="col-md-3 col-form-label text-end form-label">
-          <xed:output i18n="mir.editor.person.authorSpecification" />
-        </label> </xed:bind> <!--**TODO einrücken-->     
-        <div class="col-md-6">
-          <div class="controls">
-              <select id="{xed:generate-id()}_authorSpecification" class="form-control form-control-inline form-select">
-                <option value="">
-                  <xed:output i18n="mir.select.optional" />
-                </option>
-                <xed:include uri="xslStyle:items2options:classification:editor:-1:children:author_roles" />
-              </select>
+            <xed:output i18n="mir.editor.person.authorSpecification" />
+          </label>
+          <div class="col-md-6">
+            <div class="controls">
+                <select id="{xed:generate-id()}_authorSpecification" class="form-control form-control-inline form-select">
+                  <option value="">
+                    <xed:output i18n="mir.select.optional" />
+                  </option>
+                  <xed:include uri="xslStyle:items2options:classification:editor:-1:children:author_roles" />
+                </select>
+            </div>
           </div>
-        </div>
-        <mir:help-pmud help-text="{i18n:mir.help.authorSpecification}" pmud="true" />
-            </xed:bind>
+          <mir:help-pmud help-text="{i18n:mir.help.authorSpecification}" pmud="true" />
+        </xed:bind>
       </div>
     </xed:repeat>
   </xed:template>
@@ -1362,25 +1362,22 @@
   </xed:template>
 
   <xed:template id="host.pages">
-    <xed:bind xpath="mods:part/mods:extent[@unit='pages']/mods:list">
     <div class="mir-form-group row mir-modspart">
       <xed:bind xpath="mods:part/mods:extent[@unit='pages']/mods:list">
-      <label for="{xed:generate-id()}_host_pages" class="col-md-3 col-form-label text-end form-label">
-        <xed:output i18n="mir.pages" />:
-      </label>
-      <div class="col-md-6">
-        <div class="form-inline">
+        <label for="{xed:generate-id()}_host_pages" class="col-md-3 col-form-label text-end form-label">
+          <xed:output i18n="mir.pages" />:
+        </label>
+        <div class="col-md-6">
+          <div class="form-inline">
             <input id="{xed:generate-id()}_host_pages" type="text" size="20" class="form-control form-control-inline" />
+          </div>
         </div>
-      </div>
     </xed:bind>
       <mir:help-pmud help-text="{i18n:mir.help.host.pages}" />
     </div>
-  </xed:bind>
   </xed:template>
 
   <xed:template id="host.order">
-    <xed:bind xpath="mods:part/@order">
     <div class="mir-form-group row mir-modspart">
       <xed:bind xpath="mods:part/@order">
         <label for="{xed:generate-id()}_host_order" class="col-md-3 col-form-label text-end form-label">
@@ -1394,7 +1391,6 @@
         <mir:help-pmud help-text="{i18n:mir.help.host.order}" />
       </xed:bind>
     </div>
-  </xed:bind>
   </xed:template>
 
   <xed:template id="host.lecture.semester">
@@ -1407,18 +1403,17 @@
 
   <xed:template id="language">
     <xed:repeat xpath="mods:language" max="5">
-      <xed:bind xpath="mods:languageTerm[@authority='rfc5646'][@type='code']" initially="de">
-      <div class="mir-form-group row {$xed-validation-marker}">
-        <xed:bind xpath="mods:languageTerm[@authority='rfc5646'][@type='code']" initially="de">
-          <label for="{xed:generate-id()}_lang" class="col-md-3 col-form-label text-end form-label">
-            <xed:output i18n="mir.language" />
-          </label>
-          <div class="col-md-6">
-            <div class="controls">
-              <xed:include ref="lang.list"/>
+        <div class="mir-form-group row {$xed-validation-marker}">
+          <xed:bind xpath="mods:languageTerm[@authority='rfc5646'][@type='code']" initially="de">
+            <label for="{xed:generate-id()}_lang" class="col-md-3 col-form-label text-end form-label">
+              <xed:output i18n="mir.language" />
+            </label>
+            <div class="col-md-6">
+              <div class="controls">
+                <xed:include ref="lang.list"/>
+              </div>
             </div>
-          </div>
-          <mir:help-pmud help-text="{i18n:mir.help.language}" pmud="true" />
+            <mir:help-pmud help-text="{i18n:mir.help.language}" pmud="true" />
         </xed:bind>
       </div>
     </xed:repeat>
@@ -1567,25 +1562,25 @@
 
   <xed:template id="institutes">
     <div class="mir-form-group row">
-        <xed:load-resource name="mir_institutes" uri="classification:metadata:-1:children:mir_institutes" />
-        <xed:bind xpath="mods:name[@type='corporate'][@authorityURI=$mir_institutes/label[@xml:lang='x-uri']/@text]">
+      <xed:load-resource name="mir_institutes" uri="classification:metadata:-1:children:mir_institutes" />
+      <xed:bind xpath="mods:name[@type='corporate'][@authorityURI=$mir_institutes/label[@xml:lang='x-uri']/@text]">
         <xed:bind xpath="mods:role/mods:roleTerm[@authority='marcrelator'][@type='code']" initially="his" /><!--  Host institution [his] -->
         <xed:bind xpath="@valueURIxEditor">
-        <label for="{xed:generate-id()}_institutes" class="col-md-3 col-form-label text-end form-label">
-          <xed:output i18n="mir.institution" />
-          :
-        </label>
-        <div class="col-md-6">
-          <select id="{xed:generate-id()}_institutes" class="form-control form-control-inline mir-form__js-select--large form-select">
-            <option value="">
-              <xed:output i18n="mir.select.optional" />
-            </option>
-            <xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_institutes" />
-          </select>
-      </div>
-      <mir:help-pmud help-text="{i18n:mir.help.institutes}" />
-          </xed:bind>
+          <label for="{xed:generate-id()}_institutes" class="col-md-3 col-form-label text-end form-label">
+            <xed:output i18n="mir.institution" />
+            :
+          </label>
+          <div class="col-md-6">
+            <select id="{xed:generate-id()}_institutes" class="form-control form-control-inline mir-form__js-select--large form-select">
+              <option value="">
+                <xed:output i18n="mir.select.optional" />
+              </option>
+              <xed:include uri="xslStyle:items2options:classification:editor:-1:children:mir_institutes" />
+            </select>
+          </div>
+          <mir:help-pmud help-text="{i18n:mir.help.institutes}" />
         </xed:bind>
+      </xed:bind>
     </div>
   </xed:template>
 
@@ -1684,12 +1679,12 @@
   <xed:template id="sdnb.repeat">
     <xed:repeat xpath="mods:classification[@authority='sdnb'][@displayLabel='sdnb']" min="1" max="10" method="build">
       <div class="mir-form-group row required {$xed-validation-marker}">
-        <label for="{xed:generate-id()}" class="col-md-3 col-form-label text-end form-label">
+        <label for="{xed:generate-id()}_sdnb" class="col-md-3 col-form-label text-end form-label">
           <xed:output i18n="editor.search.mir.sdnb" />
           :
         </label>
         <div class="col-md-6">
-          <select id="{xed:generate-id()}" class="form-control form-control-inline mir-form__js-select--large form-select">
+          <select id="{xed:generate-id()}_sdnb" class="form-control form-control-inline mir-form__js-select--large form-select">
             <option value="">
               <xed:output i18n="mir.select" />
             </option>
@@ -1733,8 +1728,8 @@
               <xed:output i18n="mir.abstract.in" />
             </label>
             <div class="col-md-6">
-              <xed:bind id="abstract_translated" xpath="@xml:lang">
-                <xed:include id="abstract_translated" ref="lang.list" />
+              <xed:bind xpath="@xml:lang">
+                <xed:include ref="lang.list" />
               </xed:bind>
             </div>
             <mir:help-pmud help-text="{i18n:mir.help.abstract.language}" pmud="true" />
@@ -1753,7 +1748,6 @@
       </legend>
       <xed:repeat xpath="mods:abstract" min="1" max="3">
         <div class="mir-fieldset-content">
-          <xed:bind xpath="@xml:lang" initially="de">
           <div class="mir-form-group row">
             <xed:bind xpath="@xml:lang" initially="de">
               <label for="{xed:generate-id()}_lang" class="col-md-3 col-form-label text-end form-label">
@@ -1765,7 +1759,6 @@
               <mir:help-pmud help-text="{i18n:mir.help.abstract.language}" pmud="true" />
           </xed:bind>
           </div>
-        </xed:bind>
           <mir:textfield xpath="@xlink:href" label="mir.placeholder.abstract.link" help-text="{i18n:mir.help.abstract.aslink}" placeholder="{i18n:mir.placeholder.abstract.link}" />
           <mir:htmlArea xpath="." label="mir.abstract.ortext" help-text="{i18n:mir.help.abstract.ortext}" rows="5" />
         </div>
@@ -2061,8 +2054,8 @@
                     <xed:include uri="xslStyle:items2options,convertClassificationOptions:classification:editor:-1:children:noteTypes" />
                 </select>
               </div>
-              </xed:bind >
-              <mir:help-pmud help-text="{i18n:mir.help.comment.type}" pmud="true" />
+            </xed:bind >
+            <mir:help-pmud help-text="{i18n:mir.help.comment.type}" pmud="true" />
           </div>
           <mir:textarea xpath="." label="mir.comment" help-text="{i18n:mir.help.comment}" rows="3" />
         </div>

From 39dbeccafc8cd5c07fe4f74e7e97c46769b02b60 Mon Sep 17 00:00:00 2001
From: Ahmad Obeid <obeid@fh-aachen.de>
Date: Thu, 22 Jan 2026 10:17:02 +0100
Subject: [PATCH 5/6] fix error in issue

---
 mir-cli/src/main/bin/setup.sh                                 | 0
 .../resources/META-INF/resources/editor/editor-includes.xed   | 4 ++--
 mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl      | 3 ++-
 mir-module/src/tools/updateless.sh                            | 0
 4 files changed, 4 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 mir-cli/src/main/bin/setup.sh
 mode change 100755 => 100644 mir-module/src/tools/updateless.sh

diff --git a/mir-cli/src/main/bin/setup.sh b/mir-cli/src/main/bin/setup.sh
old mode 100755
new mode 100644
diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index 115de799db..960811afed 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -682,13 +682,13 @@
     <!-- affiliation with authorityURI https://ror.org/ -->
     <xed:repeat xpath="mods:affiliation[@authorityURI='https://ror.org/']" min="1" max="10">
       <div class="mir-form-group row">
-        <label class="col-md-3 col-form-label text-end">
+        <label for="ror_id" class="col-md-3 col-form-label text-end">
           <xed:output i18n="mir.affiliation.with.ror.id.label"/>
         </label>
 
         <div class="col-md-6">
           <xed:bind xpath=".">
-            <select class="form-control mir-select-searchable mir-select-affiliation"
+            <select id="ror_id" class="form-control mir-select-searchable mir-select-affiliation"
                     data-placeholder="{i18n:mir.affiliation.with.ror.id.placeholder}">
 
               <xed:choose>
diff --git a/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl b/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
index 91805176bf..4d64818934 100644
--- a/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
+++ b/mir-module/src/main/resources/xsl/editor/mir2xeditor.xsl
@@ -559,7 +559,8 @@
   <xsl:template match="mir:insitut.repeated">
     <xsl:variable name="xed-val-marker" > {$xed-validation-marker} </xsl:variable>
     <xed:repeat xpath="mods:name[@type='corporate'][@authorityURI='{$institutesURI}']" min="{@min}" max="{@max}">
-      <xed:bind xpath="@valueURIxEditor">
+      <xed:bind xpath=".">
+      <xed:bind xpath="@valueURIxEditor"/>
       <xsl:variable name="select_id" select="concat(@label,'{xed:generate-id()}')" />
       <div class="mir-form-group row {@class} {$xed-val-marker}">
         <label for="{$select_id}" class="col-md-3 col-form-label text-end form-label">
diff --git a/mir-module/src/tools/updateless.sh b/mir-module/src/tools/updateless.sh
old mode 100755
new mode 100644

From 687006842d126edfe293a40d75e1a8371248c748 Mon Sep 17 00:00:00 2001
From: Ahmad Obeid <obeid@fh-aachen.de>
Date: Tue, 3 Feb 2026 16:11:56 +0100
Subject: [PATCH 6/6] Fix accessibility issue in new added scope "project
 information"

---
 .../resources/editor/editor-includes.xed      | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index 3ef5c68cfc..6d83d41a81 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -2039,62 +2039,62 @@
       <xed:bind xpath="mods:extension[@type='datacite-funding']/datacite:fundingReferences" xmlns:datacite="http://datacite.org/schema/kernel-4">
         <xed:repeat xpath="datacite:fundingReference">
           <div class="mir-fieldset-content mir-editor-project-container">
-            <div class="mir-form-group row">
-              <label class="col-md-3 col-form-label text-end form-label">
-                <xed:output i18n="mir.editor.project.title"/>
-              </label>
-              <xed:bind xpath="datacite:awardTitle">
-                <div class="col-md-6 {$xed-validation-marker}">
-                  <input type="text" class="form-control project-title" autocomplete="off"/>
-                  <xed:validate relevant-if="string-length(../datacite:awardNumber)&gt;0" required="true"
-                    i18n="mir.editor.project.title.validation" display="global"/>
-                </div>
-              </xed:bind>
-              <mir:help-pmud help-text="{i18n:mir.editor.project.title.help}" pmud="true"/>
-            </div>
-            <div class="mir-form-group row">
-              <label class="col-md-3 col-form-label text-end form-label">
-                <xed:output i18n="mir.editor.project.id"/>
-              </label>
-              <div class="col-md-6">
-                <xed:bind xpath="datacite:awardNumber">
+            <xed:bind xpath="datacite:awardTitle">
+              <div class="mir-form-group row">
+                <label for="{xed:generate-id()}_project-title" class="col-md-3 col-form-label text-end form-label">
+                  <xed:output i18n="mir.editor.project.title"/>
+                </label>
+                  <div class="col-md-6 {$xed-validation-marker}">
+                    <input id="{xed:generate-id()}_project-title" type="text" class="form-control project-title" autocomplete="off"/>
+                    <xed:validate relevant-if="string-length(../datacite:awardNumber)&gt;0" required="true"
+                      i18n="mir.editor.project.title.validation" display="global"/>
+                  </div>
+                <mir:help-pmud help-text="{i18n:mir.editor.project.title.help}" pmud="true"/>
+              </div>
+            </xed:bind>
+            <xed:bind xpath="datacite:awardNumber">
+              <div class="mir-form-group row">
+                <label for="{xed:generate-id()}_project-id" class="col-md-3 col-form-label text-end form-label">
+                  <xed:output i18n="mir.editor.project.id"/>
+                </label>
+                <div class="col-md-6">
                   <div class="row">
                     <div class="col-md-4">
-                      <input type="text" class="form-control project-id"/>
+                      <input id="{xed:generate-id()}_project-id" type="text" class="form-control project-id"/>
                     </div>
                     <div class="col-md-8 ps-0">
                       <xed:bind xpath="@awardURI">
-                        <input type="text" class="form-control project-uri" placeholder="{i18n:mir.editor.project.uri}"/>
+                        <input aria-label="project uri" type="text" class="form-control project-uri" placeholder="{i18n:mir.editor.project.uri}"/>
                       </xed:bind>
                     </div>
                   </div>
-                </xed:bind>
+                </div>
+                <mir:help-pmud help-text="{i18n:mir.editor.project.id.help}"/>
               </div>
-              <mir:help-pmud help-text="{i18n:mir.editor.project.id.help}"/>
-            </div>
-            <div class="mir-form-group row">
-              <label class="col-md-3 col-form-label text-end form-label">
-                <xed:output i18n="mir.editor.project.funder.name"/>
-              </label>
-              <xed:bind xpath="datacite:funderName">
+            </xed:bind>
+            <xed:bind xpath="datacite:funderName">
+              <div class="mir-form-group row">
+                <label for="{xed:generate-id()}_funder-name" class="col-md-3 col-form-label text-end form-label">
+                  <xed:output i18n="mir.editor.project.funder.name"/>
+                </label>
                 <div class="col-md-6 {$xed-validation-marker}">
-                  <input type="text" class="form-control funder-name" autocomplete="off"/>
+                  <input id="{xed:generate-id()}_funder-name" type="text" class="form-control funder-name" autocomplete="off"/>
                   <xed:validate relevant-if="string-length(../datacite:awardNumber)&gt;0 or string-length(../datacite:awardNumber/@awardURI)&gt;0 or string-length(../datacite:awardTitle)&gt;0 or string-length(../datacite:funderIdentifier)&gt;0"
                     required="true" i18n="mir.editor.project.funder.name.validation" display="global"/>
                 </div>
-              </xed:bind>
-              <mir:help-pmud help-text="{i18n:mir.editor.project.funder.name.help}"/>
-            </div>
-            <div class="mir-form-group row">
-              <label class="col-md-3 col-form-label text-end form-label">
-                <xed:output i18n="mir.editor.project.funder.id"/>
-              </label>
-              <xed:bind xpath="datacite:funderIdentifier">
+                <mir:help-pmud help-text="{i18n:mir.editor.project.funder.name.help}"/>
+              </div>
+            </xed:bind>
+            <xed:bind xpath="datacite:funderIdentifier">
+              <div class="mir-form-group row">
+                <label for="{xed:generate-id()}_funder-value" class="col-md-3 col-form-label text-end form-label">
+                  <xed:output i18n="mir.editor.project.funder.id"/>
+                </label>
                 <div class="col-md-6">
                   <div class="row">
                     <xed:bind xpath="@funderIdentifierType">
                       <div class="col-md-4 {$xed-validation-marker}">
-                        <select class="form-control form-control-inline form-select funder-id-type">
+                        <select aria-label="select funder type" class="form-control form-control-inline form-select funder-id-type">
                           <option value="">
                             <xed:output i18n="mir.select"/>
                           </option>
@@ -2119,15 +2119,15 @@
                       </div>
                     </xed:bind>
                     <div class="col-md-8 ps-0 {$xed-validation-marker}">
-                      <input type="text" class="form-control funder-id-value" />
+                      <input id="{xed:generate-id()}_funder-value" type="text" class="form-control funder-id-value" />
                       <xed:validate relevant-if="string-length(@funderIdentifierType)&gt;0" required="true"
                         i18n="mir.editor.project.funder.id.validation" display="global"/>
                     </div>
                   </div>
                 </div>
-              </xed:bind>
-              <mir:help-pmud help-text="{i18n:mir.editor.project.funder.id.help}"/>
-            </div>
+                <mir:help-pmud help-text="{i18n:mir.editor.project.funder.id.help}"/>
+              </div>
+            </xed:bind>
           </div>
         </xed:repeat>
       </xed:bind>