Index: collections/collections-module/src/main/datamodel/def/imgitem.xml
===================================================================
diff -u -N -r4461 -r4594
--- collections/collections-module/src/main/datamodel/def/imgitem.xml	(.../imgitem.xml)	(revision 4461)
+++ collections/collections-module/src/main/datamodel/def/imgitem.xml	(.../imgitem.xml)	(revision 4594)
@@ -49,10 +49,6 @@
     </element>
     <!-- Schlagwort -->
     <element name="keywords" type="text" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore"/>
-    <element name="editStatus" type="classification" minOccurs="0" maxOccurs="unbounded" style="select" notinherit="ignore"
-             heritable="ignore">
-      <classification id="editStatus"/>
-    </element>
     <element name="link" type="href" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore"/>
     <element name="ddc" type="classification" minOccurs="0" maxOccurs="unbounded" style="select" notinherit="ignore" heritable="ignore">
       <classification id="dewey"/>
Index: collections/collections-module/src/main/resources/META-INF/resources/editor/file/editor-file.xed
===================================================================
diff -u -N -r4487 -r4594
--- collections/collections-module/src/main/resources/META-INF/resources/editor/file/editor-file.xed	(.../editor-file.xed)	(revision 4487)
+++ collections/collections-module/src/main/resources/META-INF/resources/editor/file/editor-file.xed	(.../editor-file.xed)	(revision 4594)
@@ -129,5 +129,7 @@
     <div name="hiddenCoordinates" style="display: none;">
       <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.coordinates"/>
     </div>
+
+    <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="servstate"/>
   </xed:template>
 </xed:template>
Index: collections/collections-module/src/main/resources/xsl/metadata/visitation-tabs.xsl
===================================================================
diff -u -N -r3587 -r4594
--- collections/collections-module/src/main/resources/xsl/metadata/visitation-tabs.xsl	(.../visitation-tabs.xsl)	(revision 3587)
+++ collections/collections-module/src/main/resources/xsl/metadata/visitation-tabs.xsl	(.../visitation-tabs.xsl)	(revision 4594)
@@ -142,14 +142,6 @@
           <xsl:with-param select="i18n:translate('metaData.visitation.entitylink.editor')" name="label"/>
         </xsl:call-template>
 
-        <!--xx***edit status************************************* -->
-        <xsl:if test="not(./metadata/def.editStatus/editStatus[@categid='finished'])">
-          <xsl:call-template name="printMetaDate">
-            <xsl:with-param select="./metadata/def.editStatus/editStatus" name="nodes"/>
-            <xsl:with-param select="i18n:translate('metaData.common.editStatus')" name="label"/>
-          </xsl:call-template>
-        </xsl:if>
-
         <!--*** Editor Buttons ************************************* -->
         <xsl:call-template name="collections.edit">
           <xsl:with-param name="id" select="./@ID"/>
@@ -246,7 +238,7 @@
     </xsl:comment>
 
     <xsl:variable name="class">
-      <xsl:if test="mcrxml:isInCategory(@xlink:href,'editStatus:progress')">
+      <xsl:if test="mcrxml:isInCategory(@xlink:href,'state:review')">
         <xsl:value-of select="'editStatusProgressListItem'"/>
       </xsl:if>
     </xsl:variable>
Index: collections/collections-cli/src/main/config/classifications/editStatus.xml
===================================================================
diff -u -N
--- collections/collections-cli/src/main/config/classifications/editStatus.xml	(revision 815)
+++ collections/collections-cli/src/main/config/classifications/editStatus.xml	(revision 0)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<mycoreclass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MCRClassification.xsd" ID="editStatus">
-  <label xml:lang="de" text="Bearbeitungszustand" />
-  <categories>
-    <category ID="progress">
-      <label xml:lang="de" text="Dokument in Bearbeitung" />
-    </category>
-    <category ID="finished">
-      <label xml:lang="de" text="Bearbeitung abgeschlossen" />
-    </category>
-  </categories>
-</mycoreclass>
\ No newline at end of file
Index: collections/collections-module/src/main/resources/xsl/metadata/page.xsl
===================================================================
diff -u -N -r3622 -r4594
--- collections/collections-module/src/main/resources/xsl/metadata/page.xsl	(.../page.xsl)	(revision 3622)
+++ collections/collections-module/src/main/resources/xsl/metadata/page.xsl	(.../page.xsl)	(revision 4594)
@@ -113,14 +113,6 @@
         <xsl:with-param select="i18n:translate('metaData.page.note')" name="label"/>
       </xsl:call-template>
 
-      <!--xx***edit status************************************* -->
-      <xsl:if test="not(./metadata/def.editStatus/editStatus[@categid='finished'])">
-        <xsl:call-template name="printMetaDate">
-          <xsl:with-param select="./metadata/def.editStatus/editStatus" name="nodes"/>
-          <xsl:with-param select="i18n:translate('metaData.common.editStatus')" name="label"/>
-        </xsl:call-template>
-      </xsl:if>
-
       <!--*** Editor Buttons ************************************* -->
       <xsl:call-template name="collections.edit">
         <xsl:with-param name="id" select="./@ID"/>
@@ -220,4 +212,4 @@
     </div>
   </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Index: collections/collections-module/src/main/resources/META-INF/resources/editor/showcase/editor-showcase.xed
===================================================================
diff -u -N -r4481 -r4594
--- collections/collections-module/src/main/resources/META-INF/resources/editor/showcase/editor-showcase.xed	(.../editor-showcase.xed)	(revision 4481)
+++ collections/collections-module/src/main/resources/META-INF/resources/editor/showcase/editor-showcase.xed	(.../editor-showcase.xed)	(revision 4594)
@@ -6,30 +6,30 @@
 
   <xed:template id="edit_showcase">
     <editor:template name="textInput"
-                      xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/title[@inherited='0'][@form='plain']"
-                      maxlength="512"
-                      i18n="metaData.showcase.title" buttons="false" validation="required" error="editor.error.showcase.title"/>
+                     xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/title[@inherited='0'][@form='plain']"
+                     maxlength="512"
+                     i18n="metaData.showcase.title" buttons="false" validation="required" error="editor.error.showcase.title"/>
 
     <editor:template name="textInput"
-                      xpath="def.leaf[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/leaf[@inherited='0'][@form='plain']"
-                      maxlength="512"
-                      i18n="metaData.page.leaf" buttons="false"/>
+                     xpath="def.leaf[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/leaf[@inherited='0'][@form='plain']"
+                     maxlength="512"
+                     i18n="metaData.page.leaf" buttons="false"/>
 
     <xed:bind
-            xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='installationSite'][@inherited='0'][@form='plain']">
+        xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='installationSite'][@inherited='0'][@form='plain']">
       <editor:template name="textInput" xpath="." maxlength="512" i18n="metaData.showcase.place_installationSite" buttons="false"
-                        validation="">
+                       validation="">
       </editor:template>
       <xed:validate display="local" matches="\p{Digit}+[-]*\p{Digit}*\p{Alnum}*">
         <editor:template name='validate-message' error="editor.error.showcase.gnd"/>
       </xed:validate>
     </xed:bind>
 
     <xed:repeat
-            xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='significant'][@inherited='0'][@form='plain']"
-            min="1" max="30">
+        xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='significant'][@inherited='0'][@form='plain']"
+        min="1" max="30">
       <editor:template name="textInput" xpath="." maxlength="512" i18n="metaData.showcase.place_significant" buttons="true"
-                        validation="">
+                       validation="">
       </editor:template>
       <xed:validate display="local" matches="\p{Digit}+[-]*\p{Digit}*\p{Alnum}*">
         <editor:template name='validate-message' error="editor.error.showcase.gnd"/>
@@ -42,100 +42,98 @@
     <editor:template name="title" i18n="editor.furtherDetails"/>
     <xed:bind xpath="def.date[@class='MCRMetaISO8601Date'][@heritable='false'][@notinherit='true']">
       <editor:template name="textInput" xpath="date[@type='from'][@inherited='0']" maxlength="512" i18n="metaData.showcase.date_from"
-                        buttons="false" validation="date" error="editor.publicDomain.date.validationFailed"/>
+                       buttons="false" validation="date" error="editor.publicDomain.date.validationFailed"/>
       <editor:template name="textInput" xpath="date[@type='to'][@inherited='0']" maxlength="512" i18n="metaData.showcase.date_to"
-                        buttons="false" validation="date" error="editor.publicDomain.date.validationFailed"/>
+                       buttons="false" validation="date" error="editor.publicDomain.date.validationFailed"/>
     </xed:bind>
 
     <editor:template name="textInput"
-                      xpath="def.dateReadable[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/dateReadable[@inherited='0'][@form='plain']"
-                      maxlength="512" i18n="metaData.showcase.date_readable" buttons="false"/>
+                     xpath="def.dateReadable[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/dateReadable[@inherited='0'][@form='plain']"
+                     maxlength="512" i18n="metaData.showcase.date_readable" buttons="false"/>
 
     <editor:template name="select"
-                      xpath="def.tradition[@class='MCRMetaClassification'][@heritable='false'][@notinherit='false']/tradition[@inherited='0'][@classid='tradition']/@categid"
-                      classification="tradition" i18n="metaData.showcase.tradition" cacheable="false"/>
+                     xpath="def.tradition[@class='MCRMetaClassification'][@heritable='false'][@notinherit='false']/tradition[@inherited='0'][@classid='tradition']/@categid"
+                     classification="tradition" i18n="metaData.showcase.tradition" cacheable="false"/>
 
     <editor:template name="textArea"
-                      xpath="def.historicalPlacement[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/historicalPlacement[@inherited='0'][@form='plain']"
-                      i18n="metaData.showcase.historicalPlacement" buttons="false"/>
+                     xpath="def.historicalPlacement[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/historicalPlacement[@inherited='0'][@form='plain']"
+                     i18n="metaData.showcase.historicalPlacement" buttons="false"/>
 
     <editor:template name="textArea"
-                      xpath="def.translation[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/translation[@inherited='0'][@form='plain']"
-                      i18n="metaData.showcase.translation" buttons="false"/>
+                     xpath="def.translation[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/translation[@inherited='0'][@form='plain']"
+                     i18n="metaData.showcase.translation" buttons="false"/>
 
     <xed:bind xpath="def.reference[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']">
       <xed:repeat xpath="reference[@type='source'][@inherited='0']" min="0" max="30">
         <editor:template name="textInput" xpath="." i18n="metaData.showcase.reference_source" maxlength="1024" buttons="true"/>
       </xed:repeat>
       <xed:repeat xpath="reference[@type='source_href'][@inherited='0']" min="0" max="30">
         <editor:template name="textInput" xpath="." i18n="metaData.showcase.reference_source_href" maxlength="1024"
-                          buttons="true"/>
+                         buttons="true"/>
       </xed:repeat>
       <xed:repeat xpath="reference[@type='oldEditions'][@inherited='0']" min="0" max="30">
         <editor:template name="textInput" xpath="." i18n="metaData.showcase.reference_oldEditions" maxlength="1024"
-                          buttons="true"/>
+                         buttons="true"/>
       </xed:repeat>
       <xed:repeat xpath="reference[@type='oldEditions_href'][@inherited='0']" min="0" max="30">
         <editor:template name="textInput" xpath="." i18n="metaData.showcase.reference_oldEditions_href" maxlength="1024"
-                          buttons="true"/>
+                         buttons="true"/>
       </xed:repeat>
     </xed:bind>
 
     <editor:template name="textArea"
-                      xpath="def.literatur[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/literatur[@inherited='0'][@form='plain']"
-                      i18n="metaData.showcase.literatur" buttons="false"/>
+                     xpath="def.literatur[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/literatur[@inherited='0'][@form='plain']"
+                     i18n="metaData.showcase.literatur" buttons="false"/>
 
     <editor:template name="select"
-                      xpath="def.country[@class='MCRMetaClassification'][@heritable='false'][@notinherit='false']/country[@inherited='0'][@classid='visitationcountry']/@categid"
-                      classification="visitationcountry" i18n="metaData.showcase.country" cacheable="false"/>
+                     xpath="def.country[@class='MCRMetaClassification'][@heritable='false'][@notinherit='false']/country[@inherited='0'][@classid='visitationcountry']/@categid"
+                     classification="visitationcountry" i18n="metaData.showcase.country" cacheable="false"/>
 
     <editor:template name="select"
-                      xpath="def.territorial[@class='MCRMetaClassification'][@heritable='false'][@notinherit='false']/territorial[@inherited='0'][@classid='visitationterritorial']/@categid"
-                      classification="visitationterritorial" i18n="metaData.showcase.territorial" cacheable="false"/>
+                     xpath="def.territorial[@class='MCRMetaClassification'][@heritable='false'][@notinherit='false']/territorial[@inherited='0'][@classid='visitationterritorial']/@categid"
+                     classification="visitationterritorial" i18n="metaData.showcase.territorial" cacheable="false"/>
 
     <xed:repeat
-            xpath="def.linkedShowcase[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/linkedShowcase[@inherited='0'][@xlink:type='locator']"
-            min="0" max="100">
+        xpath="def.linkedShowcase[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/linkedShowcase[@inherited='0'][@xlink:type='locator']"
+        min="0" max="100">
       <editor:template name="subselect" xpath="." i18n="metaData.showcase.linkedShowcase" area="archive_showcase"
-                        btni18n="editor.search.choose.linkedShowcase" buttons="true" location="here"/>
+                       btni18n="editor.search.choose.linkedShowcase" buttons="true" location="here"/>
     </xed:repeat>
 
     <editor:template name="textArea"
-                      xpath="def.note[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/note[@inherited='0'][@form='plain']"
-                      i18n="metaData.showcase.note"
-                      buttons="false"/>
+                     xpath="def.note[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/note[@inherited='0'][@form='plain']"
+                     i18n="metaData.showcase.note"
+                     buttons="false"/>
 
     <xed:repeat
-            xpath="def.entitylink[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/entitylink[@type='editor'][@inherited='0'][@xlink:type='locator']"
-            min="0" max="10">
+        xpath="def.entitylink[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/entitylink[@type='editor'][@inherited='0'][@xlink:type='locator']"
+        min="0" max="10">
       <editor:template name="subselect" xpath="." i18n="metaData.showcase.entitylink" area="archive_persons"
-                        btni18n="editor.search.choose.person"
-                        buttons="true" location="here"/>
+                       btni18n="editor.search.choose.person"
+                       buttons="true" location="here"/>
     </xed:repeat>
 
     <xed:repeat
-            xpath="def.keywords[@class='MCRMetaClassification'][@heritable='true'][@notinherit='true']/keywords[@inherited='0'][@classid='keywords']"
-            min="0" max="50">
+        xpath="def.keywords[@class='MCRMetaClassification'][@heritable='true'][@notinherit='true']/keywords[@inherited='0'][@classid='keywords']"
+        min="0" max="50">
       <editor:template name="select" xpath="@categid" classification="keywords" i18n="metaData.showcase.keywords"
-                        cacheable="false" buttons="true"/>
+                       cacheable="false" buttons="true"/>
     </xed:repeat>
 
-    <editor:template name="select"
-                      xpath="def.editStatus[@class='MCRMetaClassification'][@heritable='false'][@notinherit='false']/editStatus[@inherited='0'][@classid='editStatus']/@categid"
-                      classification="editStatus" i18n="metaData.showcase.editStatus" cacheable="false"/>
-
     <xed:repeat
-            xpath="def.derivateLink[@class='MCRMetaDerivateLink'][@heritable='false'][@notinherit='true']/derivateLink[@inherited='0'][@xlink:type='locator']"
-            min="0" max="10">
+        xpath="def.derivateLink[@class='MCRMetaDerivateLink'][@heritable='false'][@notinherit='true']/derivateLink[@inherited='0'][@xlink:type='locator']"
+        min="0" max="10">
       <editor:template name="subselect" xpath="." i18n="metaData.editor.derivates.linkLabel" area="data_files" data-parent="{//parents/parent/@xlink:href}"
-                        btni18n="editor.search.choose.derivate" buttons="true" location="here"/>
+                       btni18n="editor.search.choose.derivate" buttons="true" location="here"/>
     </xed:repeat>
 
     <xed:repeat
-            xpath="def.key[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/key[@inherited='0'][@classid='visitationkey']"
-            min="0" max="10">
+        xpath="def.key[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/key[@inherited='0'][@classid='visitationkey']"
+        min="0" max="10">
       <editor:template name="select" xpath="@categid" classification="visitationkey" i18n="metaData.visitation.key"
-                        cacheable="false" buttons="true"/>
+                       cacheable="false" buttons="true"/>
     </xed:repeat>
+
+    <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="servstate"/>
   </xed:template>
 </xed:template>
Index: collections/collections-module/src/main/datamodel/def/visitation.xml
===================================================================
diff -u -N -r2961 -r4594
--- collections/collections-module/src/main/datamodel/def/visitation.xml	(.../visitation.xml)	(revision 2961)
+++ collections/collections-module/src/main/datamodel/def/visitation.xml	(.../visitation.xml)	(revision 4594)
@@ -38,10 +38,6 @@
       <classification id="visitationterritorial"/>
     </element>
     <element name="context" type="text" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore"/>
-    <element name="editStatus" type="classification" minOccurs="0" maxOccurs="unbounded" style="select" notinherit="ignore"
-             heritable="ignore">
-      <classification id="editStatus"/>
-    </element>
 
     <element name="place" type="xml" style="dontknow" notinherit="ignore" heritable="ignore" minOccurs="0" maxOccurs="unbounded">
       <xs:all>
Index: collections/collections-module/src/main/resources/META-INF/resources/editor/imgitem/editor-imgitem.xed
===================================================================
diff -u -N -r4592 -r4594
--- collections/collections-module/src/main/resources/META-INF/resources/editor/imgitem/editor-imgitem.xed	(.../editor-imgitem.xed)	(revision 4592)
+++ collections/collections-module/src/main/resources/META-INF/resources/editor/imgitem/editor-imgitem.xed	(.../editor-imgitem.xed)	(revision 4594)
@@ -208,15 +208,7 @@
       </xed:otherwise>
     </xed:choose>
 
-    <!-- Edit Status -->
-    <editor:template name="select"
-                     xpath="def.editStatus[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/editStatus[@inherited='0'][@classid='editStatus']/@categid"
-                     classification="editStatus" i18n="metaData.common.editStatus" noPleaseSelect="option-supplied" cacheable="false">
-      <option value="progress">
-        <xed:output i18n="editor.common.select"/>
-      </option>
-    </editor:template>
-
     <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="servstate"/>
+
   </xed:template>
 </xed:template>
Index: collections/collections-module/src/main/datamodel/def/page.xml
===================================================================
diff -u -N -r1833 -r4594
--- collections/collections-module/src/main/datamodel/def/page.xml	(.../page.xml)	(revision 1833)
+++ collections/collections-module/src/main/datamodel/def/page.xml	(.../page.xml)	(revision 4594)
@@ -21,9 +21,6 @@
 
     <element name="note" type="text" minOccurs="0" maxOccurs="unbounded" style="big" notinherit="ignore" heritable="ignore" />
     <element name="derivateLink" type="derlink" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore" />
-    <element name="editStatus" type="classification" minOccurs="0" maxOccurs="unbounded" style="select" notinherit="ignore"
-      heritable="ignore">
-      <classification id="editStatus" />
-    </element>
+
   </metadata>
-</objecttype>
\ No newline at end of file
+</objecttype>
Index: collections/collections-module/src/main/resources/xsl/metadata/file-tabs.xsl
===================================================================
diff -u -N -r4507 -r4594
--- collections/collections-module/src/main/resources/xsl/metadata/file-tabs.xsl	(.../file-tabs.xsl)	(revision 4507)
+++ collections/collections-module/src/main/resources/xsl/metadata/file-tabs.xsl	(.../file-tabs.xsl)	(revision 4594)
@@ -485,7 +485,7 @@
 
   <xsl:template match="child" mode="listitem_editable">
     <xsl:variable name="class">
-      <xsl:if test="mcrxml:isInCategory(@xlink:href,'editStatus:progress')">
+      <xsl:if test="mcrxml:isInCategory(@xlink:href,'state:review')">
         <xsl:value-of select="'editStatusProgressListItem'"/>
       </xsl:if>
     </xsl:variable>
Index: collections/collections-module/src/main/resources/xsl/metadata/cbu-tabs.xsl
===================================================================
diff -u -N -r4564 -r4594
--- collections/collections-module/src/main/resources/xsl/metadata/cbu-tabs.xsl	(.../cbu-tabs.xsl)	(revision 4564)
+++ collections/collections-module/src/main/resources/xsl/metadata/cbu-tabs.xsl	(.../cbu-tabs.xsl)	(revision 4594)
@@ -1073,7 +1073,7 @@
 
   <xsl:template match="child" mode="listitem_editable">
     <xsl:variable name="class">
-      <xsl:if test="mcrxml:isInCategory(@xlink:href,'editStatus:progress')">
+      <xsl:if test="mcrxml:isInCategory(@xlink:href,'state:review')">
         <xsl:value-of select="'editStatusProgressListItem'"/>
       </xsl:if>
     </xsl:variable>
@@ -1917,13 +1917,6 @@
       <xsl:with-param select="./metadata/def.typeface/typeface" name="nodes"/>
       <xsl:with-param select="i18n:translate('metaData.cbu.typeface')" name="label"/>
     </xsl:call-template>
-    <!-- 39 editStatus (only displayed if status is not finished) -->
-    <xsl:if test="not(./metadata/def.editStatus/editStatus[@categid='finished'])">
-      <xsl:call-template name="printMetaDate">
-        <xsl:with-param select="./metadata/def.editStatus/editStatus" name="nodes"/>
-        <xsl:with-param select="i18n:translate('metaData.common.editStatus')" name="label"/>
-      </xsl:call-template>
-    </xsl:if>
     <!-- 40 edition -->
     <xsl:call-template name="printMetaDate">
       <xsl:with-param select="./metadata/def.edition/edition" name="nodes"/>
Index: collections/collections-module/src/main/datamodel/def/showcase.xml
===================================================================
diff -u -N -r2959 -r4594
--- collections/collections-module/src/main/datamodel/def/showcase.xml	(.../showcase.xml)	(revision 2959)
+++ collections/collections-module/src/main/datamodel/def/showcase.xml	(.../showcase.xml)	(revision 4594)
@@ -42,10 +42,6 @@
       <classification id="keywords" />
     </element>
     <element name="linkedShowcase" type="link" minOccurs="0" maxOccurs="unbounded" style="subselect" notinherit="ignore" heritable="ignore" />
-    <element name="editStatus" type="classification" minOccurs="0" maxOccurs="unbounded" style="select" notinherit="ignore"
-      heritable="ignore">
-      <classification id="editStatus" />
-    </element>
     <element name="derivateLink" type="derlink" minOccurs="0" maxOccurs="unbounded" style="small" notinherit="ignore" heritable="ignore" />
     <element name="key" type="classification" minOccurs="0" maxOccurs="unbounded" style="select" notinherit="ignore" heritable="ignore">
       <classification id="visitationkey" />
Index: collections/collections-module/src/main/resources/META-INF/resources/editor/cbu/editor-cbu-commons.xed
===================================================================
diff -u -N -r4592 -r4594
--- collections/collections-module/src/main/resources/META-INF/resources/editor/cbu/editor-cbu-commons.xed	(.../editor-cbu-commons.xed)	(revision 4592)
+++ collections/collections-module/src/main/resources/META-INF/resources/editor/cbu/editor-cbu-commons.xed	(.../editor-cbu-commons.xed)	(revision 4594)
@@ -7,8 +7,8 @@
         xpath="def.entitylink[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/entitylink[@inherited='0'][@xlink:type='locator']"
         min="0" max="60">
       <editor:template name="select" xpath="@type" classification="marcrelator" i18n="editor.role"
-                        class="connectedToSubselect editor-role-select"
-                        cacheable="false" buttons="true" validation="checkPersInst" error="editor.noType"/>
+                       class="connectedToSubselect editor-role-select"
+                       cacheable="false" buttons="true" validation="checkPersInst" error="editor.noType"/>
       <editor:template name="personInst" xpath="." location="select"/>
     </xed:repeat>
   </xed:template>
@@ -18,28 +18,28 @@
         xpath="def.edition[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/edition[@inherited='0'][@classid='cbu_editions']"
         min="0" max="10">
       <editor:template name="select" xpath="@categid" cacheable="false" classification="cbu_editions"
-                        i18n="metaData.cbu.edition" buttons="false"/>
+                       i18n="metaData.cbu.edition" buttons="false"/>
     </xed:repeat>
   </xed:template>
 
   <xed:template id="def.dimensions">
     <editor:template name="textInput"
-                      xpath="def.dimensions[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/dimensions[@type='height'][@inherited='0'][@form='plain']"
-                      maxlength="512" i18n="metaData.cbu.dimensions.height" buttons="false"/>
+                     xpath="def.dimensions[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/dimensions[@type='height'][@inherited='0'][@form='plain']"
+                     maxlength="512" i18n="metaData.cbu.dimensions.height" buttons="false"/>
     <editor:template name="textInput"
-                      xpath="def.dimensions[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/dimensions[@type='width'][@inherited='0'][@form='plain']"
-                      maxlength="512" i18n="metaData.cbu.dimensions.width" buttons="false"/>
+                     xpath="def.dimensions[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/dimensions[@type='width'][@inherited='0'][@form='plain']"
+                     maxlength="512" i18n="metaData.cbu.dimensions.width" buttons="false"/>
     <editor:template name="textInput"
-                      xpath="def.dimensions[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/dimensions[@type='comment'][@inherited='0'][@form='plain']"
-                      maxlength="512" i18n="metaData.cbu.dimensions.comment" buttons="false"/>
+                     xpath="def.dimensions[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/dimensions[@type='comment'][@inherited='0'][@form='plain']"
+                     maxlength="512" i18n="metaData.cbu.dimensions.comment" buttons="false"/>
   </xed:template>
 
   <xed:template id="def.keyword.gnd">
     <xed:repeat
         xpath="def.keyword.gnd[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/keyword.gnd[@inherited='0'][@form='plain']"
         min="0" max="10">
       <editor:template name="textInput" xpath="." maxlength="128" i18n="metaData.cbu.keyword.gnd"
-                        buttons="true"/>
+                       buttons="true"/>
     </xed:repeat>
   </xed:template>
 
@@ -48,7 +48,7 @@
         xpath="def.literature.gnd[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/literature.gnd[@inherited='0'][@form='plain']"
         min="0" max="10">
       <editor:template name="textInput" xpath="." maxlength="128" i18n="metaData.cbu.literature.gnd"
-                        buttons="true"/>
+                       buttons="true"/>
     </xed:repeat>
   </xed:template>
 
@@ -57,54 +57,54 @@
         xpath="def.mentioned[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/mentioned[@type='event.gnd'][@inherited='0'][@form='plain']"
         min="0" max="10">
       <editor:template name="textInput" xpath="." maxlength="128" i18n="metaData.cbu.mentioned.event.gnd"
-                        buttons="true"/>
+                       buttons="true"/>
     </xed:repeat>
 
     <xed:repeat
         xpath="def.mentioned[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/mentioned[@type='person.gnd'][@inherited='0'][@form='plain']"
         min="0" max="10">
       <editor:template name="textInput" xpath="." maxlength="128" i18n="metaData.cbu.mentioned.person.gnd"
-                        buttons="true"/>
+                       buttons="true"/>
     </xed:repeat>
   </xed:template>
 
   <xed:template id="def.place.origin.gnd">
     <editor:template name="textArea"
-                      xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='justification'][@inherited='0'][@form='plain']"
-                      maxlength="512" i18n="metaData.cbu.place.justification" buttons="false"/>
+                     xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='justification'][@inherited='0'][@form='plain']"
+                     maxlength="512" i18n="metaData.cbu.place.justification" buttons="false"/>
   </xed:template>
 
   <xed:template id="def.date.origin">
     <editor:template name="textInput"
-                      xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='noted'][@inherited='0'][@form='plain']"
-                      maxlength="32" i18n="metaData.cbu.date.origin.noted" buttons="false"/>
+                     xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='noted'][@inherited='0'][@form='plain']"
+                     maxlength="32" i18n="metaData.cbu.date.origin.noted" buttons="false"/>
     <editor:template name="textInput"
-                      xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='real'][@inherited='0'][@form='plain']"
-                      maxlength="32" i18n="metaData.cbu.date.origin.real" buttons="false"/>
+                     xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='real'][@inherited='0'][@form='plain']"
+                     maxlength="32" i18n="metaData.cbu.date.origin.real" buttons="false"/>
     <editor:template name="textArea"
-                      xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='justification'][@inherited='0'][@form='plain']"
-                      maxlength="512" i18n="metaData.cbu.date.justification" buttons="false"/>
+                     xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='justification'][@inherited='0'][@form='plain']"
+                     maxlength="512" i18n="metaData.cbu.date.justification" buttons="false"/>
   </xed:template>
 
   <xed:template id="def.typeface">
     <xed:repeat
         xpath="def.typeface[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/typeface[@inherited='0'][@classid='cbu_typeface']"
         min="0" max="1">
       <editor:template name="select" xpath="@categid" classification="cbu_typeface" i18n="metaData.cbu.typeface"
-                        cacheable="false" buttons="false"/>
+                       cacheable="false" buttons="false"/>
     </xed:repeat>
   </xed:template>
 
   <xed:template id="def.title.subtitle">
     <editor:template name="textInput"
-                      xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='subtitle'][@inherited='0'][@form='plain']"
-                      maxlength="512" i18n="metaData.cbu.subtitle" buttons="false"/>
+                     xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='subtitle'][@inherited='0'][@form='plain']"
+                     maxlength="512" i18n="metaData.cbu.subtitle" buttons="false"/>
   </xed:template>
 
   <xed:template id="def.title.volume">
     <editor:template name="textInput"
-                      xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='volume'][@inherited='0'][@form='plain']"
-                      maxlength="512" i18n="metaData.cbu.volume" buttons="false"/>
+                     xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='volume'][@inherited='0'][@form='plain']"
+                     maxlength="512" i18n="metaData.cbu.volume" buttons="false"/>
   </xed:template>
 
   <xed:template id="def.title.district">
@@ -113,8 +113,8 @@
       <xed:bind xpath="@notinherit" initially="true"/>
 
       <editor:template name="textInput"
-                        xpath="title[@type='district'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.district" buttons="false"/>
+                       xpath="title[@type='district'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.district" buttons="false"/>
     </xed:bind>
   </xed:template>
 
@@ -124,8 +124,8 @@
       <xed:bind xpath="@notinherit" initially="true"/>
 
       <editor:template name="textInput"
-                        xpath="title[@type='field_name'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.field_name" buttons="false"/>
+                       xpath="title[@type='field_name'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.field_name" buttons="false"/>
     </xed:bind>
   </xed:template>
 
@@ -134,7 +134,7 @@
         xpath="def.transcription[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/transcription[@inherited='0']"
         min="0" max="100">
       <editor:template name="select" xpath="@type" i18n="metaData.cbu.transcription" option="true"
-                        cacheable="false" buttons="true" class="connectedToSubselect">
+                       cacheable="false" buttons="true" class="connectedToSubselect">
         <option value="normalization" i18n="metaData.cbu.transcription.normalization"/>
         <option value="hyphenation" i18n="metaData.cbu.transcription.hyphenation"/>
         <option value="correction" i18n="metaData.cbu.transcription.correction"/>
@@ -150,7 +150,7 @@
         xpath="def.application[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/application[@inherited='0']"
         min="0" max="100">
       <editor:template name="select" xpath="@type" i18n="metaData.cbu.application" option="true"
-                        cacheable="false" buttons="true" class="connectedToSubselect">
+                       cacheable="false" buttons="true" class="connectedToSubselect">
         <option value="decoration" i18n="metaData.cbu.application.decoration"/>
         <option value="note" i18n="metaData.cbu.application.note"/>
         <option value="sigil" i18n="metaData.cbu.application.sigil"/>
@@ -173,7 +173,7 @@
         xpath="def.preservation[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/preservation[@inherited='0']"
         min="0" max="1">
       <editor:template name="select" xpath="@type" i18n="metaData.cbu.condition" option="true"
-                        cacheable="false" buttons="false" class="connectedToSubselect">
+                       cacheable="false" buttons="false" class="connectedToSubselect">
         <option value="no" i18n="metaData.cbu.condition.damage.no"/>
         <option value="little" i18n="metaData.cbu.condition.damage.little"/>
         <option value="medium" i18n="metaData.cbu.condition.damage.medium"/>
@@ -196,88 +196,88 @@
 
     <xed:template id="def.title.ordinary">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='ordinary'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.title_ordinary" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='ordinary'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.title_ordinary" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.de">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='title_de'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.title.title_de" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='title_de'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.title.title_de" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.main">
       <editor:template name="textArea"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='main_title'][@inherited='0'][@form='plain']"
-                        i18n="editor.cbu.title.main_title" validation="required" error="editor.error.cbu.main_title" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='main_title'][@inherited='0'][@form='plain']"
+                       i18n="editor.cbu.title.main_title" validation="required" error="editor.error.cbu.main_title" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.main.not.required">
       <editor:template name="textArea"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='main_title'][@inherited='0'][@form='plain']"
-                        i18n="editor.cbu.title.main_title" error="editor.error.cbu.main_title" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='main_title'][@inherited='0'][@form='plain']"
+                       i18n="editor.cbu.title.main_title" error="editor.error.cbu.main_title" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.heading">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='heading_title'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.title.heading_title" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='heading_title'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.title.heading_title" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.altHeading">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='alternativ_heading_title'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.title.alternativ_heading_title" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='alternativ_heading_title'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.title.alternativ_heading_title" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.proper">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='proper'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.title_proper" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='proper'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.title_proper" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.uniform">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='uniform'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.title_uniform" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='uniform'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.title_uniform" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.uniform_title">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='uniform_title'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.title.uniform_title" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='uniform_title'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.title.uniform_title" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.series">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='series_title'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.title.superior_title" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='series_title'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.title.superior_title" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.hierarchy1">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='hierarchy_level_1'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.hierarchy_level_1" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='hierarchy_level_1'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.hierarchy_level_1" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.title.hierarchy2">
       <editor:template name="textInput"
-                        xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='hierarchy_level_2'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.hierarchy_level_2" buttons="false"/>
+                       xpath="def.title[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/title[@type='hierarchy_level_2'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.hierarchy_level_2" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.volumeStatement">
       <editor:template name="textInput"
-                        xpath="def.volumeStatement[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/volumeStatement[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.volumeStatement" buttons="false"/>
+                       xpath="def.volumeStatement[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/volumeStatement[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.volumeStatement" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.entitylink.proband">
       <xed:repeat
           xpath="def.entitylink[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/entitylink[@type='proband'][@inherited='0'][@xlink:type='locator']"
           min="0" max="30">
         <editor:template name="subselect" xpath="." i18n="metaData.cbu.entitylink.proband" area="archive_persons"
-                          import="true" btni18n="editor.search.choose.person" buttons="true" location="here"/>
+                         import="true" btni18n="editor.search.choose.person" buttons="true" location="here"/>
       </xed:repeat>
     </xed:template>
 
@@ -286,7 +286,7 @@
           xpath="def.entitylink[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/entitylink[@type='witness'][@inherited='0'][@xlink:type='locator']"
           min="0" max="30">
         <editor:template name="subselect" xpath="." i18n="metaData.cbu.entitylink.witness" area="archive_persons"
-                          import="true" btni18n="editor.search.choose.person" buttons="true" location="here"/>
+                         import="true" btni18n="editor.search.choose.person" buttons="true" location="here"/>
       </xed:repeat>
     </xed:template>
 
@@ -295,7 +295,7 @@
           xpath="def.entitylink[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/entitylink[@type='ancestor'][@inherited='0'][@xlink:type='locator']"
           min="0" max="30">
         <editor:template name="subselect" xpath="." i18n="metaData.cbu.entitylink.ancestor" area="archive_persons"
-                          import="true" btni18n="editor.search.choose.person" buttons="true" location="here"/>
+                         import="true" btni18n="editor.search.choose.person" buttons="true" location="here"/>
       </xed:repeat>
     </xed:template>
 
@@ -305,7 +305,7 @@
         <xed:bind xpath="@notinherit" initially="true"/>
         <xed:repeat xpath="component[@inherited='0'][@classid='ArchFile_class_001']" min="1" max="1">
           <editor:template name="select" xpath="@categid" classification="ArchFile_class_001" i18n="metaData.cbu.component"
-                            cacheable="false" buttons="false" validation="required" error="editor.error.file.component"/>
+                           cacheable="false" buttons="false" validation="required" error="editor.error.file.component"/>
         </xed:repeat>
       </xed:bind>
     </xed:template>
@@ -316,7 +316,7 @@
         <xed:bind xpath="@notinherit" initially="true"/>
         <xed:repeat xpath="project[@inherited='0'][@classid='projects']" min="0" max="4">
           <editor:template name="select" xpath="@categid" classification="projects" i18n="metaData.cbu.project"
-                            cacheable="false" buttons="true"/>
+                           cacheable="false" buttons="true"/>
         </xed:repeat>
       </xed:bind>
     </xed:template>
@@ -326,76 +326,76 @@
           xpath="def.shelfmark[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/shelfmark[@inherited='0'][@form='plain']"
           min="0" max="10">
         <editor:template name="textInput" xpath="." maxlength="512" i18n="metaData.cbu.shelfmark"
-                          buttons="true"/>
+                         buttons="true"/>
       </xed:repeat>
     </xed:template>
 
     <xed:template id="def.shelfmark.actual">
       <editor:template name="textInput"
-                        xpath="def.shelfmark[@class='MCRMetaLangText'][@heritable='true'][@notinherit='true']/shelfmark[@type='actual'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.shelfmark_actual" buttons="false"/>
+                       xpath="def.shelfmark[@class='MCRMetaLangText'][@heritable='true'][@notinherit='true']/shelfmark[@type='actual'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.shelfmark_actual" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.shelfmark.old">
       <editor:template name="textInput"
-                        xpath="def.shelfmark[@class='MCRMetaLangText'][@heritable='true'][@notinherit='true']/shelfmark[@type='old'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.shelfmark_old" buttons="false"/>
+                       xpath="def.shelfmark[@class='MCRMetaLangText'][@heritable='true'][@notinherit='true']/shelfmark[@type='old'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.shelfmark_old" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.shelfmark.film">
       <editor:template name="textInput"
-                        xpath="def.shelfmark[@class='MCRMetaLangText'][@heritable='true'][@notinherit='true']/shelfmark[@type='film'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.shelfmark_film" buttons="false"/>
+                       xpath="def.shelfmark[@class='MCRMetaLangText'][@heritable='true'][@notinherit='true']/shelfmark[@type='film'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.shelfmark_film" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.includes">
       <editor:template name="textArea"
-                        xpath="def.includes[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/includes[@inherited='0'][@form='plain']"
-                        i18n="metaData.cbu.includes" buttons="false"/>
+                       xpath="def.includes[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/includes[@inherited='0'][@form='plain']"
+                       i18n="metaData.cbu.includes" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.extent">
       <xed:bind xpath="def.extent[@class='MCRMetaLangText']">
         <xed:bind xpath="@heritable" initially="false"/>
         <xed:bind xpath="@notinherit" initially="false"/>
         <editor:template name="textInput" xpath="extent[@inherited='0'][@form='plain']" maxlength="512"
-                          i18n="metaData.map.extent" buttons="false"/>
+                         i18n="metaData.map.extent" buttons="false"/>
       </xed:bind>
     </xed:template>
 
     <xed:template id="def.extent.generations">
       <editor:template name="textInput"
-                        xpath="def.extent[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/extent[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.generations" buttons="false"/>
+                       xpath="def.extent[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/extent[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.generations" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.materialType">
       <editor:template name="textInput"
-                        xpath="def.materialType[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/materialType[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.hwu.materialType" buttons="false"/>
+                       xpath="def.materialType[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/materialType[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.hwu.materialType" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.scale">
       <xed:bind xpath="def.scale[@class='MCRMetaLangText']">
         <xed:bind xpath="@heritable" initially="false"/>
         <xed:bind xpath="@notinherit" initially="false"/>
         <editor:template name="textInput" xpath="scale[@inherited='0'][@form='plain']" maxlength="512"
-                          i18n="metaData.map.scale" buttons="false"/>
+                         i18n="metaData.map.scale" buttons="false"/>
       </xed:bind>
     </xed:template>
 
     <xed:template id="def.viewing">
       <editor:template name="textInput"
-                        xpath="def.viewing[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/viewing[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.map.viewing" buttons="false"/>
+                       xpath="def.viewing[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/viewing[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.map.viewing" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.inserts">
       <xed:bind xpath="def.inserts[@class='MCRMetaLangText']">
         <xed:bind xpath="@heritable" initially="false"/>
         <xed:bind xpath="@notinherit" initially="false"/>
         <editor:template name="textInput" xpath="inserts[@inherited='0'][@form='plain']" maxlength="512"
-                          i18n="metaData.map.inserts" buttons="false"/>
+                         i18n="metaData.map.inserts" buttons="false"/>
       </xed:bind>
     </xed:template>
 
@@ -416,7 +416,7 @@
         <xed:bind xpath="@heritable" initially="false"/>
         <xed:bind xpath="@notinherit" initially="false"/>
         <editor:template name="textInput" xpath="keywords[@inherited='0'][@form='plain']" maxlength="512"
-                          i18n="metaData.map.keywords" buttons="false"/>
+                         i18n="metaData.map.keywords" buttons="false"/>
       </xed:bind>
     </xed:template>
 
@@ -426,51 +426,51 @@
         <xed:bind xpath="@notinherit" initially="false"/>
         <div class="coordinateContainer">
           <editor:template name="textInputSm" xpath="." i18n="metaData.map.coordinates"
-                            class="fixContainer fixPagePlaceContainer coordinatesGMS" buttons="false">
+                           class="fixContainer fixPagePlaceContainer coordinatesGMS" buttons="false">
 
             <editor:template name="title" i18n="metaData.map.coordinates.long"/>
             <editor:template name="textInput" htmlid="inputCoordinatesWest"
-                              xpath="coordinates[@type='west'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.west" maxlength="512" validation="" buttons="false"/>
+                             xpath="coordinates[@type='west'][@inherited='0'][@form='plain']"
+                             i18n="metaData.map.coordinates.west" maxlength="512" validation="" buttons="false"/>
 
             <editor:template name="textInput" htmlid="inputCoordinatesEast"
-                              xpath="coordinates[@type='east'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.east" maxlength="512" validation="" buttons="false"/>
+                             xpath="coordinates[@type='east'][@inherited='0'][@form='plain']"
+                             i18n="metaData.map.coordinates.east" maxlength="512" validation="" buttons="false"/>
 
 
             <editor:template name="title" i18n="metaData.map.coordinates.lat"/>
 
             <editor:template name="textInput" htmlid="inputCoordinatesNorth"
-                              xpath="coordinates[@type='north'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.north" maxlength="512" validation="" buttons="false"/>
+                             xpath="coordinates[@type='north'][@inherited='0'][@form='plain']"
+                             i18n="metaData.map.coordinates.north" maxlength="512" validation="" buttons="false"/>
 
             <editor:template name="textInput" htmlid="inputCoordinatesSouth"
-                              xpath="coordinates[@type='south'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.south" maxlength="512" validation="" buttons="false"/>
+                             xpath="coordinates[@type='south'][@inherited='0'][@form='plain']"
+                             i18n="metaData.map.coordinates.south" maxlength="512" validation="" buttons="false"/>
           </editor:template>
 
           <editor:template name="textInputSm" xpath="." i18n="metaData.map.coordinates.decimal"
-                            class="fixContainer fixPagePlaceContainer coordinatesDez" buttons="false">
+                           class="fixContainer fixPagePlaceContainer coordinatesDez" buttons="false">
 
             <editor:template name="title" i18n="metaData.map.coordinates.decimal.lat"/>
             <editor:template name="textInput" xpath="coordinates[@type='lat_top_left'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.lat_top_left" maxlength="512" validation="" buttons="false"/>
+                             i18n="metaData.map.coordinates.lat_top_left" maxlength="512" validation="" buttons="false"/>
             <editor:template name="textInput"
-                              xpath="coordinates[@type='lat_bottom_right'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.lat_bottom_right"
-                              maxlength="512" validation="" buttons="false"/>
+                             xpath="coordinates[@type='lat_bottom_right'][@inherited='0'][@form='plain']"
+                             i18n="metaData.map.coordinates.lat_bottom_right"
+                             maxlength="512" validation="" buttons="false"/>
             <editor:template name="textInput" xpath="coordinates[@type='lat_center'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.lat_center" maxlength="512" validation="" buttons="false"/>
+                             i18n="metaData.map.coordinates.lat_center" maxlength="512" validation="" buttons="false"/>
 
             <editor:template name="title" i18n="metaData.map.coordinates.decimal.lon"/>
             <editor:template name="textInput" xpath="coordinates[@type='lon_top_left'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.lon_top_left" maxlength="512" validation="" buttons="false"/>
+                             i18n="metaData.map.coordinates.lon_top_left" maxlength="512" validation="" buttons="false"/>
             <editor:template name="textInput"
-                              xpath="coordinates[@type='lon_bottom_right'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.lon_bottom_right"
-                              maxlength="512" validation="" buttons="false"/>
+                             xpath="coordinates[@type='lon_bottom_right'][@inherited='0'][@form='plain']"
+                             i18n="metaData.map.coordinates.lon_bottom_right"
+                             maxlength="512" validation="" buttons="false"/>
             <editor:template name="textInput" xpath="coordinates[@type='lon_center'][@inherited='0'][@form='plain']"
-                              i18n="metaData.map.coordinates.lon_center" maxlength="512" validation="" buttons="false"/>
+                             i18n="metaData.map.coordinates.lon_center" maxlength="512" validation="" buttons="false"/>
           </editor:template>
         </div>
 
@@ -493,31 +493,31 @@
         <xed:bind xpath="@heritable" initially="false"/>
         <xed:bind xpath="@notinherit" initially="false"/>
         <editor:template name="textInput" xpath="trimImage[@type='x'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="test" buttons="false"/>
+                         maxlength="512" i18n="test" buttons="false"/>
         <editor:template name="textInput" xpath="trimImage[@type='y'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="test" buttons="false"/>
+                         maxlength="512" i18n="test" buttons="false"/>
         <editor:template name="textInput" xpath="trimImage[@type='w'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="test" buttons="false"/>
+                         maxlength="512" i18n="test" buttons="false"/>
         <editor:template name="textInput" xpath="trimImage[@type='h'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="test" buttons="false"/>
+                         maxlength="512" i18n="test" buttons="false"/>
       </xed:bind>
     </xed:template>
 
     <xed:template id="def.extent.withTypes">
       <xed:bind xpath="def.extent[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']">
         <editor:template name="textInput" xpath="extent[@type='leaf'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="metaData.cbu.extent_leaf" buttons="false"/>
+                         maxlength="512" i18n="metaData.cbu.extent_leaf" buttons="false"/>
         <editor:template name="textInput" xpath="extent[@type='piece'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="metaData.cbu.extent_piece" buttons="false"/>
+                         maxlength="512" i18n="metaData.cbu.extent_piece" buttons="false"/>
         <editor:template name="textInput" xpath="extent[@type='envelope'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="metaData.cbu.extent_envelope" buttons="false"/>
+                         maxlength="512" i18n="metaData.cbu.extent_envelope" buttons="false"/>
       </xed:bind>
     </xed:template>
 
     <xed:template id="def.note">
       <editor:template name="textArea"
-                        xpath="def.note[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/note[@inherited='0'][@form='plain'][not(@type)]"
-                        i18n="metaData.cbu.annotation" buttons="false"/>
+                       xpath="def.note[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/note[@inherited='0'][@form='plain'][not(@type)]"
+                       i18n="metaData.cbu.annotation" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.incipit.ByDE">
@@ -554,54 +554,54 @@
 
     <xed:template id="def.leafSuccession">
       <editor:template name="textInput"
-                        xpath="def.leafSuccession[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/leafSuccession[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.leafSuccession" buttons="false"/>
+                       xpath="def.leafSuccession[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/leafSuccession[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.leafSuccession" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.writing">
       <editor:template name="textInput"
-                        xpath="def.writing[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/writing[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.writing" buttons="false"/>
+                       xpath="def.writing[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/writing[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.writing" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.tradition">
       <editor:template name="textInput"
-                        xpath="def.tradition[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/tradition[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.hwu.tradition" buttons="false"/>
+                       xpath="def.tradition[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/tradition[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.hwu.tradition" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.date">
       <editor:template name="textInput"
-                        xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.date" buttons="false"/>
+                       xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.date" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.date.primary">
       <editor:template name="textInput"
-                        xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='primary'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.hwu.date.primary" buttons="false"/>
+                       xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='primary'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.hwu.date.primary" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.date.secondary">
       <editor:template name="textInput"
-                        xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='secondary'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.hwu.date.secondary" buttons="false"/>
+                       xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='secondary'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.hwu.date.secondary" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.date.publicDomain">
       <editor:template name="textInput"
-                        xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='publicDomain'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.date_publicDomain" validation="date.specific"
-                        error="editor.publicDomain.date.validationFailed"
-                        buttons="false"/>
+                       xpath="def.date[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/date[@type='publicDomain'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.date_publicDomain" validation="date.specific"
+                       error="editor.publicDomain.date.validationFailed"
+                       buttons="false"/>
     </xed:template>
 
     <xed:template id="def.place.publisher">
       <xed:repeat
           xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='publisher'][@inherited='0'][@form='plain']"
           min="0" max="5">
         <editor:template name="textInput" xpath="." maxlength="512"
-                          i18n="metaData.cbu.entitylink.publishingCompany" buttons="true"/>
+                         i18n="metaData.cbu.entitylink.publishingCompany" buttons="true"/>
       </xed:repeat>
     </xed:template>
 
@@ -610,7 +610,7 @@
           xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='printing_original_item'][@inherited='0'][@form='plain']"
           min="0" max="5">
         <editor:template name="textInput" xpath="." maxlength="512"
-                          i18n="metaData.cbu.placeOfPrintingByOriginalItem" buttons="true"/>
+                         i18n="metaData.cbu.placeOfPrintingByOriginalItem" buttons="true"/>
       </xed:repeat>
     </xed:template>
 
@@ -619,7 +619,7 @@
           xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='printing_de'][@inherited='0'][@form='plain']"
           min="0" max="5">
         <editor:template name="textInput" xpath="." maxlength="512" i18n="metaData.cbu.placeOfPrintingDE"
-                          buttons="true"/>
+                         buttons="true"/>
       </xed:repeat>
     </xed:template>
 
@@ -628,7 +628,7 @@
           xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='printing_de_gnd'][@inherited='0'][@form='plain']"
           min="0" max="5">
         <editor:template name="textInput" xpath="." maxlength="512" i18n="metaData.cbu.placeOfPrintingDE_gnd"
-                          buttons="true"/>
+                         buttons="true"/>
       </xed:repeat>
     </xed:template>
 
@@ -649,39 +649,39 @@
         <xed:bind xpath="@notinherit" initially="true"/>
 
         <editor:template name="textInput" onkeyup="coordinatesFromGnd(this)"
-                          xpath="place[@type='gnd'][@inherited='0'][@form='plain']"
-                          i18n="metaData.imgitem.place_relatedObject" maxlength="512" buttons="false"/>
+                         xpath="place[@type='gnd'][@inherited='0'][@form='plain']"
+                         i18n="metaData.imgitem.place_relatedObject" maxlength="512" buttons="false"/>
       </xed:bind>
     </xed:template>
 
     <xed:template id="def.place.publishingCompany">
       <editor:template name="textInput"
-                        xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='publisher'][@inherited='0'][@form='plain']"
-                        i18n="metaData.cbu.entitylink.publishingCompany" maxlength="512" buttons="false"/>
+                       xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='publisher'][@inherited='0'][@form='plain']"
+                       i18n="metaData.cbu.entitylink.publishingCompany" maxlength="512" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.place.mentionedGND">
       <editor:template name="textInput"
-                        xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='mentionedGND'][@inherited='0'][@form='plain']"
-                        i18n="metaData.cbu.place_mentioned" maxlength="512" buttons="false"/>
+                       xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='mentionedGND'][@inherited='0'][@form='plain']"
+                       i18n="metaData.cbu.place_mentioned" maxlength="512" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.place.pointOfOriginGND">
       <editor:template name="textInput"
-                        xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='pointOfOriginGND'][@inherited='0'][@form='plain']"
-                        i18n="metaData.cbu.pointOfOriginGND" maxlength="512" buttons="false"/>
+                       xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='pointOfOriginGND'][@inherited='0'][@form='plain']"
+                       i18n="metaData.cbu.pointOfOriginGND" maxlength="512" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.place.delivery">
       <editor:template name="textInput"
-                        xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='delivery'][@inherited='0'][@form='plain']"
-                        i18n="metaData.cbu.delivery" maxlength="512" buttons="false"/>
+                       xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='delivery'][@inherited='0'][@form='plain']"
+                       i18n="metaData.cbu.delivery" maxlength="512" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.place.deliveryGND">
       <editor:template name="textInput"
-                        xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='deliveryGND'][@inherited='0'][@form='plain']"
-                        i18n="metaData.cbu.deliveryGND" maxlength="512" buttons="false"/>
+                       xpath="def.place[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/place[@type='deliveryGND'][@inherited='0'][@form='plain']"
+                       i18n="metaData.cbu.deliveryGND" maxlength="512" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.place">
@@ -694,113 +694,113 @@
 
     <xed:template id="def.reference">
       <editor:template name="textInput"
-                        xpath="def.reference[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/reference[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.reference" buttons="false"/>
+                       xpath="def.reference[@class='MCRMetaLangText'][@heritable='false'][@notinherit='false']/reference[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.reference" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier">
       <xed:bind xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']">
         <editor:template name="textInput" xpath="identifier[@type='ident'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="metaData.cbu.identifier_ident" buttons="false"/>
+                         maxlength="512" i18n="metaData.cbu.identifier_ident" buttons="false"/>
         <editor:template name="textInput" xpath="identifier[@type='stock'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="metaData.cbu.identifier_stock" buttons="false"/>
+                         maxlength="512" i18n="metaData.cbu.identifier_stock" buttons="false"/>
         <editor:template name="textInput" xpath="identifier[@type='lfdnr'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="metaData.cbu.identifier_lfdnr" buttons="false"/>
+                         maxlength="512" i18n="metaData.cbu.identifier_lfdnr" buttons="false"/>
         <editor:template name="textInput" xpath="identifier[@type='sort'][@inherited='0'][@form='plain']"
-                          maxlength="512" i18n="metaData.cbu.identifier_sort" buttons="false"/>
+                         maxlength="512" i18n="metaData.cbu.identifier_sort" buttons="false"/>
       </xed:bind>
     </xed:template>
 
     <xed:template id="def.identifier.ppn">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='ppn'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.ppn" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='ppn'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.ppn" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.ppnDigital">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='ppn_digital'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.ppn.digital" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='ppn_digital'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.ppn.digital" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.ppnGbv">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='gbv-ppn'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.identifier_gbv-ppn" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='gbv-ppn'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.identifier_gbv-ppn" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.ppnPredecessor">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='ppn_predecessor'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.ppn.predecessor" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='ppn_predecessor'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.ppn.predecessor" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.be">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='be'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.be" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='be'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.be" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.vd16">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='vd16'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.vd16" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='vd16'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.vd16" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.vd17">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='vd17'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.vd17" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='vd17'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.vd17" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.vd18">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='vd18'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.vd18" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='vd18'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.vd18" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.mxml">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='mxml'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.hwu.mxml" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='mxml'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.hwu.mxml" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.gwid">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='gwid'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.gwid" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='gwid'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.gwid" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.bsbink">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='bsbink'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.bsbink" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='bsbink'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.bsbink" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.istc">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='istc'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.istc" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='istc'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.istc" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.letter">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='letter'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.letter" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='letter'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.letter" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.sheet">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='sheet'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.sheet" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='sheet'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.sheet" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.transaction_key">
       <xed:bind xpath="def.identifier[@class='MCRMetaLangText']">
         <xed:bind xpath="@heritable" initially="true"/>
         <xed:bind xpath="@notinherit" initially="false"/>
         <editor:template name="textInput" xpath="identifier[@type='transaction_key'][@inherited='0'][@form='plain']" maxlength="512"
-                          i18n="metaData.file.identifier.transaction_key" buttons="false"/>
+                         i18n="metaData.file.identifier.transaction_key" buttons="false"/>
       </xed:bind>
     </xed:template>
 
@@ -809,40 +809,40 @@
         <xed:bind xpath="@heritable" initially="true"/>
         <xed:bind xpath="@notinherit" initially="false"/>
         <editor:template name="textInput" xpath="identifier[@type='document_key'][@inherited='0'][@form='plain']" maxlength="512"
-                          i18n="metaData.file.identifier.document_key" buttons="false"/>
+                         i18n="metaData.file.identifier.document_key" buttons="false"/>
       </xed:bind>
     </xed:template>
 
     <xed:template id="def.identifier.folder">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='folder'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.folder" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='folder'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.folder" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.kalliope">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='kalliopeID'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.kalliope" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='kalliopeID'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.kalliope" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.identifier.correspondence">
       <editor:template name="textInput"
-                        xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='correspondence'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.correspondence" buttons="false"/>
+                       xpath="def.identifier[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/identifier[@type='correspondence'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.correspondence" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.linkedCbu">
       <xed:repeat
           xpath="def.linkedCbu[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/linkedCbu[@type='replies'][@inherited='0'][@xlink:type='locator']"
           min="0" max="100">
         <editor:template name="select" xpath="@type" i18n="metaData.cbu.linkedEstate" option="true"
-                          buttons="true" class="connectedToSubselect">
+                         buttons="true" class="connectedToSubselect">
           <!-- <option value="" i18n="editor.common.select" /> -->
           <option value="replies" i18n="metaData.cbu.linkedCbu_replies"/>
           <option value="repliedBy" i18n="metaData.cbu.linkedCbu_repliedBy"/>
         </editor:template>
         <editor:template name="subselect" xpath="." area="archive_estates" import="false"
-                          btni18n="editor.search.choose.linkedEstate" location="select"/>
+                         btni18n="editor.search.choose.linkedEstate" location="select"/>
       </xed:repeat>
     </xed:template>
 
@@ -851,7 +851,7 @@
           xpath="def.linkedCbu[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/linkedCbu[@type='replies'][@inherited='0'][@xlink:type='locator']"
           min="0" max="100">
         <editor:template name="subselect" xpath="." i18n="metaData.cbu.linkedCbu_replies" area="archive_estates"
-                          import="false" btni18n="editor.search.choose.linkedEstate" buttons="true" location="here"/>
+                         import="false" btni18n="editor.search.choose.linkedEstate" buttons="true" location="here"/>
       </xed:repeat>
     </xed:template>
 
@@ -860,7 +860,7 @@
           xpath="def.linkedCbu[@class='MCRMetaLinkID'][@heritable='false'][@notinherit='true']/linkedCbu[@type='repliedBy'][@inherited='0'][@xlink:type='locator']"
           min="0" max="100">
         <editor:template name="subselect" xpath="." i18n="metaData.cbu.linkedCbu_repliedBy" area="archive_estates"
-                          import="false" btni18n="editor.search.choose.linkedEstate" buttons="true" location="here"/>
+                         import="false" btni18n="editor.search.choose.linkedEstate" buttons="true" location="here"/>
       </xed:repeat>
     </xed:template>
 
@@ -869,112 +869,112 @@
           xpath="def.derivateLink[@class='MCRMetaDerivateLink'][@heritable='false'][@notinherit='true']/derivateLink[@inherited='0'][@xlink:type='locator']"
           min="0" max="1">
         <editor:template name="subselect" xpath="." i18n="metaData.cbu.editor.derivates.linkLabel"
-                          area="data_files"
-                          data-parent="{xed:call-java('de.uni_jena.thulb.archive.tools.MCRArchiveUtils', 'getFirstParentWithDerivate', string(//mycoreobject/@ID), string(//parents/parent/@xlink:href))}"
-                          btni18n="editor.search.choose.derivate" buttons="true"/>
+                         area="data_files"
+                         data-parent="{xed:call-java('de.uni_jena.thulb.archive.tools.MCRArchiveUtils', 'getFirstParentWithDerivate', string(//mycoreobject/@ID), string(//parents/parent/@xlink:href))}"
+                         btni18n="editor.search.choose.derivate" buttons="true"/>
         <editor:template name="textArea" xpath="annotation[@xml:lang='de']" buttons="false"/>
       </xed:repeat>
     </xed:template>
 
     <xed:template id="def.abstract">
       <editor:template name="textArea"
-                        xpath="def.abstract[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/abstract[@inherited='0'][@form='plain']"
-                        i18n="metaData.cbu.abstract" buttons="false"/>
+                       xpath="def.abstract[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/abstract[@inherited='0'][@form='plain']"
+                       i18n="metaData.cbu.abstract" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.history">
       <editor:template name="textArea"
-                        xpath="def.history[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/history[@inherited='0'][@form='plain']"
-                        i18n="metaData.hwu.history" buttons="false"/>
+                       xpath="def.history[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/history[@inherited='0'][@form='plain']"
+                       i18n="metaData.hwu.history" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.layout">
       <editor:template name="textArea"
-                        xpath="def.layout[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/layout[@inherited='0'][@form='plain']"
-                        i18n="metaData.hwu.layout" buttons="false"/>
+                       xpath="def.layout[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/layout[@inherited='0'][@form='plain']"
+                       i18n="metaData.hwu.layout" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.numberOfColumns">
       <editor:template name="textInput"
-                        xpath="def.numberOfColumns[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/numberOfColumns[@inherited='0'][@form='plain']"
-                        i18n="metaData.hwu.numberOfColumns" buttons="false"/>
+                       xpath="def.numberOfColumns[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/numberOfColumns[@inherited='0'][@form='plain']"
+                       i18n="metaData.hwu.numberOfColumns" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.numberOfLine">
       <editor:template name="textInput"
-                        xpath="def.numberOfLine[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/numberOfLine[@inherited='0'][@form='plain']"
-                        i18n="metaData.hwu.numberOfLine" buttons="false"/>
+                       xpath="def.numberOfLine[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/numberOfLine[@inherited='0'][@form='plain']"
+                       i18n="metaData.hwu.numberOfLine" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.composite">
       <editor:template name="textInput"
-                        xpath="def.composite[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/composite[@inherited='0'][@form='plain']"
-                        i18n="metaData.hwu.composite" buttons="false"/>
+                       xpath="def.composite[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/composite[@inherited='0'][@form='plain']"
+                       i18n="metaData.hwu.composite" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.font">
       <editor:template name="textInput"
-                        xpath="def.font[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/font[@inherited='0'][@form='plain']"
-                        i18n="metaData.hwu.font" buttons="false"/>
+                       xpath="def.font[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/font[@inherited='0'][@form='plain']"
+                       i18n="metaData.hwu.font" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.areaOfText">
       <editor:template name="textInput"
-                        xpath="def.areaOfText[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/areaOfText[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.hwu.areaOfText" buttons="false"/>
+                       xpath="def.areaOfText[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/areaOfText[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.hwu.areaOfText" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.format">
       <editor:template name="textInput"
-                        xpath="def.format[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/format[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.format" buttons="false"/>
+                       xpath="def.format[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/format[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.format" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.illustrationDecl">
       <editor:template name="textInput"
-                        xpath="def.illustrationDecl[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/illustrationDecl[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.illustrationDecl" buttons="false"/>
+                       xpath="def.illustrationDecl[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/illustrationDecl[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.illustrationDecl" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.editionStatement">
       <editor:template name="textInput"
-                        xpath="def.editionStatement[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/editionStatement[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.editionStatement" buttons="false"/>
+                       xpath="def.editionStatement[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/editionStatement[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.editionStatement" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.volumeCount.originalItem">
       <editor:template name="textArea"
-                        xpath="def.volumeCount[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/volumeCount[@type='original_item'][@inherited='0'][@form='plain']"
-                        i18n="metaData.cbu.countByOriginalItem" buttons="false"/>
+                       xpath="def.volumeCount[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/volumeCount[@type='original_item'][@inherited='0'][@form='plain']"
+                       i18n="metaData.cbu.countByOriginalItem" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.volumeCount">
       <editor:template name="textArea"
-                        xpath="def.volumeCount[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/volumeCount[@type='standard'][@inherited='0'][@form='plain']"
-                        i18n="metaData.cbu.volumeCount" buttons="false"/>
+                       xpath="def.volumeCount[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/volumeCount[@type='standard'][@inherited='0'][@form='plain']"
+                       i18n="metaData.cbu.volumeCount" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.fingerprint">
       <xed:repeat
           xpath="def.fingerprint[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/fingerprint[not(@type)][@inherited='0'][@form='plain']"
           min="1">
         <editor:template name="textInput" xpath="." maxlength="512" i18n="metaData.cbu.fingerprint"
-                          buttons="remove" onlyOnePlease="notType"/>
+                         buttons="remove" onlyOnePlease="notType"/>
       </xed:repeat>
     </xed:template>
 
     <xed:template id="def.fingerprint.alternative">
       <editor:template name="textInput"
-                        xpath="def.fingerprint[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/fingerprint[@type='alternative'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.fingerprint_alternative" buttons="false"/>
+                       xpath="def.fingerprint[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/fingerprint[@type='alternative'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.fingerprint_alternative" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.fingerprintOrigin">
       <xed:repeat
           xpath="def.fingerprintOrigin[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/fingerprintOrigin[@inherited='0'][@form='plain']"
           min="1">
         <editor:template name="textInput" xpath="." maxlength="512" i18n="metaData.cbu.fingerprintOrigin"
-                          buttons="remove" onlyOnePlease="true"/>
+                         buttons="remove" onlyOnePlease="true"/>
       </xed:repeat>
     </xed:template>
 
@@ -983,7 +983,7 @@
           xpath="def.ddc[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/ddc[@inherited='0'][@classid='dewey']"
           min="3" max="3">
         <editor:template name="select" xpath="@categid" classification="dewey" i18n="metaData.common.ddc"
-                          cacheable="false" buttons="true"/>
+                         cacheable="false" buttons="true"/>
       </xed:repeat>
     </xed:template>
 
@@ -1000,7 +1000,7 @@
           xpath="def.taxonomy[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/taxonomy[@inherited='0'][@classid='taxonomy']"
           min="0" max="10">
         <editor:template name="select" xpath="@categid" classification="taxonomy" i18n="metaData.cbu.taxonomy"
-                          cacheable="false" buttons="true"/>
+                         cacheable="false" buttons="true"/>
       </xed:repeat>
     </xed:template>
 
@@ -1009,14 +1009,14 @@
           xpath="def.genre[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/genre[@inherited='0'][@classid='genre']"
           min="0" max="3">
         <editor:template name="select" xpath="@categid" classification="genre" i18n="metaData.cbu.genre"
-                          cacheable="false" buttons="true"/>
+                         cacheable="false" buttons="true"/>
       </xed:repeat>
     </xed:template>
 
     <xed:template id="def.location">
       <editor:template name="textInput"
-                        xpath="def.location[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/location[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.location" buttons="false"/>
+                       xpath="def.location[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/location[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.location" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.literature">
@@ -1036,7 +1036,7 @@
         <xed:bind xpath="@notinherit" initially="false"/>
         <xed:repeat xpath="link[@inherited='0'][@xlink:type='locator']" min="0" max="10">
           <editor:template name="textInput" xpath="@xlink:href" maxlength="512" i18n="metaData.hwu.link"
-                            buttons="true"/>
+                           buttons="true"/>
           <editor:template name="textArea" xpath="@type" maxlength="512" buttons="true"/>
         </xed:repeat>
       </xed:bind>
@@ -1046,7 +1046,7 @@
       <xed:bind
           xpath="def.source[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/source[@type='sru-url'][@inherited='0'][@form='plain']">
         <editor:template name="textInput" xpath="." maxlength="128" i18n="editor.cbu.source.sru-url"
-                          validation="" buttons="false" disabled="disabled"/>
+                         validation="" buttons="false" disabled="disabled"/>
         <xed:validate display="local" matches="(ftp|http|https):\/\/(www\.)?[\w\d.]+\S*">
           <editor:template name='validate-message' error="editor.cbu.source.validationFailed"/>
         </xed:validate>
@@ -1057,7 +1057,7 @@
       <xed:bind
           xpath="def.source[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/source[@type='catalog'][@inherited='0'][@form='plain']">
         <editor:template name="textInput" xpath="." maxlength="128" i18n="editor.cbu.source"
-                          validation="" buttons="false"/>
+                         validation="" buttons="false"/>
         <xed:validate display="local" matches="(ftp|http|https):\/\/(www\.)?[\w\d.]+\S*">
           <editor:template name='validate-message' error="editor.cbu.source.validationFailed"/>
         </xed:validate>
@@ -1069,29 +1069,16 @@
           xpath="def.bibReference[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/bibReference[@inherited='0'][@form='plain']"
           min="0" max="7">
         <editor:template name="textInput" xpath="." maxlength="512" i18n="metaData.cbu.bibReference"
-                          buttons="true"/>
+                         buttons="true"/>
       </xed:repeat>
     </xed:template>
 
-    <xed:template id="def.editStatus">
-      <xed:bind xpath="def.editStatus[@class='MCRMetaClassification']">
-        <xed:bind xpath="@heritable" initially="false"/>
-        <xed:bind xpath="@notinherit" initially="true"/>
-        <editor:template name="select" xpath="editStatus[@inherited='0'][@classid='editStatus']/@categid"
-                          classification="editStatus" i18n="metaData.common.editStatus" noPleaseSelect="option-supplied" cacheable="false">
-          <option value="progress">
-            <xed:output i18n="editor.common.select"/>
-          </option>
-        </editor:template>
-      </xed:bind>
-    </xed:template>
-
     <xed:template id="def.language">
       <xed:repeat
           xpath="def.language[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/language[@inherited='0'][@classid='ISO639-2']"
           min="0" max="10">
         <editor:template name="select" xpath="@categid" classification="ISO639-2" i18n="metaData.hwu.language"
-                          cacheable="false" buttons="true"/>
+                         cacheable="false" buttons="true"/>
       </xed:repeat>
     </xed:template>
 
@@ -1100,7 +1087,7 @@
           xpath="def.language[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/language[@inherited='0'][@classid='ISO639-2']"
           min="0" max="10">
         <editor:template name="select" xpath="@categid" classification="ISO639-2" i18n="metaData.cbu.language"
-                          cacheable="false" buttons="true"/>
+                         cacheable="false" buttons="true"/>
       </xed:repeat>
     </xed:template>
 
@@ -1109,50 +1096,50 @@
         <xed:bind xpath="@heritable" initially="true"/>
         <xed:bind xpath="@notinherit" initially="false"/>
         <editor:template name="textInput" xpath="pages[@inherited='0'][@form='plain']" maxlength="512"
-                          i18n="metaData.hwu.pages" buttons="false"/>
+                         i18n="metaData.hwu.pages" buttons="false"/>
       </xed:bind>
     </xed:template>
 
     <xed:template id="def.relevantMaterial.biblelatin">
       <editor:template name="textInput"
-                        xpath="def.relevantMaterial[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/relevantMaterial[@type='biblelatin'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.hwu.relevantMaterial.bible.latin" buttons="false"/>
+                       xpath="def.relevantMaterial[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/relevantMaterial[@type='biblelatin'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.hwu.relevantMaterial.bible.latin" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.relevantMaterial.bibleother">
       <editor:template name="textInput"
-                        xpath="def.relevantMaterial[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/relevantMaterial[@type='bibleother'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.hwu.relevantMaterial.bible.other" buttons="false"/>
+                       xpath="def.relevantMaterial[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/relevantMaterial[@type='bibleother'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.hwu.relevantMaterial.bible.other" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.entry">
       <editor:template name="textInput"
-                        xpath="def.entry[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/entry[@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.hwu.entry" buttons="false"/>
+                       xpath="def.entry[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/entry[@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.hwu.entry" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.oom_highlightText">
       <editor:template name="textArea"
-                        xpath="def.oom[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/oom[@type='highlightText'][@inherited='0'][@form='plain']"
-                        maxlength="512" i18n="metaData.cbu.highlightText" buttons="false"/>
+                       xpath="def.oom[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/oom[@type='highlightText'][@inherited='0'][@form='plain']"
+                       maxlength="512" i18n="metaData.cbu.highlightText" buttons="false"/>
     </xed:template>
 
     <xed:template id="def.oom_highlightStatus">
       <editor:template name="textInput" disabled="disabled"
-                        xpath="def.oom[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/oom[@type='status'][@inherited='0'][@form='plain']"
-                        maxlength="512" buttons="false" i18n="metaData.cbu.oom.status"/>
+                       xpath="def.oom[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/oom[@type='status'][@inherited='0'][@form='plain']"
+                       maxlength="512" buttons="false" i18n="metaData.cbu.oom.status"/>
     </xed:template>
 
     <xed:template id="def.oom_highlightFrom">
       <editor:template name="textInput" disabled="disabled"
-                        xpath="def.oom[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/oom[@type='from'][@inherited='0'][@form='plain']"
-                        maxlength="512" buttons="false" i18n="metaData.cbu.oom.status.from"/>
+                       xpath="def.oom[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/oom[@type='from'][@inherited='0'][@form='plain']"
+                       maxlength="512" buttons="false" i18n="metaData.cbu.oom.status.from"/>
     </xed:template>
 
     <xed:template id="def.oom_highlight">
       <editor:template name="select"
-                        xpath="def.oom[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/oom[@type='highlight'][@inherited='0'][@form='plain']"
-                        maxlength="512" buttons="false" i18n="metaData.cbu.markedAsHighlight" option="true">
+                       xpath="def.oom[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/oom[@type='highlight'][@inherited='0'][@form='plain']"
+                       maxlength="512" buttons="false" i18n="metaData.cbu.markedAsHighlight" option="true">
         <option value="true" i18n="metaData.cbu.highlite.yes"/>
         <option value="false" i18n="metaData.cbu.highlite.no"/>
       </editor:template>
@@ -1163,7 +1150,7 @@
           xpath="def.key[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/key[@inherited='0'][@classid='visitationkey']"
           min="0" max="10">
         <editor:template name="select" xpath="@categid" classification="visitationkey" i18n="metaData.visitation.key"
-                          cacheable="false" buttons="true"/>
+                         cacheable="false" buttons="true"/>
       </xed:repeat>
     </xed:template>
   </xed:template>
@@ -1174,7 +1161,7 @@
       <xed:bind xpath="@heritable" initially="false"/>
       <xed:bind xpath="@notinherit" initially="true"/>
       <editor:template name="textInput" xpath="area[@inherited='0'][@form='plain']" maxlength="512"
-                        i18n="metaData.fieldMap.area" buttons="false"/>
+                       i18n="metaData.fieldMap.area" buttons="false"/>
     </xed:bind>
   </xed:template>
 
@@ -1183,15 +1170,15 @@
       <xed:bind xpath="@heritable" initially="false"/>
       <xed:bind xpath="@notinherit" initially="true"/>
       <editor:template name="textArea" xpath="utilisation[@inherited='0'][@form='plain']" maxlength="512"
-                        i18n="metaData.fieldMap.utilisation" buttons="false"/>
+                       i18n="metaData.fieldMap.utilisation" buttons="false"/>
     </xed:bind>
   </xed:template>
   <xed:template id="def.evidence">
     <xed:bind xpath="def.evidence[@class='MCRMetaLangText']">
       <xed:bind xpath="@heritable" initially="false"/>
       <xed:bind xpath="@notinherit" initially="true"/>
       <editor:template name="textArea" xpath="evidence[@inherited='0'][@form='plain']" maxlength="512"
-                        i18n="metaData.fieldMap.evidence" buttons="false"/>
+                       i18n="metaData.fieldMap.evidence" buttons="false"/>
     </xed:bind>
   </xed:template>
 
@@ -1200,7 +1187,7 @@
       <xed:bind xpath="@heritable" initially="false"/>
       <xed:bind xpath="@notinherit" initially="true"/>
       <editor:template name="textArea" xpath="explanation[@inherited='0'][@form='plain']" maxlength="512"
-                        i18n="metaData.fieldMap.explanation" buttons="false"/>
+                       i18n="metaData.fieldMap.explanation" buttons="false"/>
     </xed:bind>
   </xed:template>
 
@@ -1209,7 +1196,7 @@
       <xed:bind xpath="@heritable" initially="false"/>
       <xed:bind xpath="@notinherit" initially="true"/>
       <editor:template name="textArea" xpath="interpretation[@inherited='0'][@form='plain']" maxlength="512"
-                        i18n="metaData.fieldMap.interpretation" buttons="false"/>
+                       i18n="metaData.fieldMap.interpretation" buttons="false"/>
     </xed:bind>
   </xed:template>
 
@@ -1218,7 +1205,7 @@
       <xed:bind xpath="@heritable" initially="false"/>
       <xed:bind xpath="@notinherit" initially="true"/>
       <editor:template name="textInput" xpath="dialect[@inherited='0'][@form='plain']" maxlength="512"
-                        i18n="metaData.fieldMap.dialect" buttons="false"/>
+                       i18n="metaData.fieldMap.dialect" buttons="false"/>
     </xed:bind>
   </xed:template>
 
@@ -1228,8 +1215,8 @@
       <xed:bind xpath="@notinherit" initially="true"/>
       <xed:repeat xpath="ref[@inherited='0'][@xlink:type='locator'][@type='paratext']" min="0" max="1">
         <editor:template name="subselect" xpath="." i18n="metaData.cbu.ref.paratext" area="paratexts"
-                          btni18n="editor.search.choose" help="editor.help.cbu.ref.paratext" buttons="true"
-                          location="here"/>
+                         btni18n="editor.search.choose" help="editor.help.cbu.ref.paratext" buttons="true"
+                         location="here"/>
       </xed:repeat>
     </xed:bind>
   </xed:template>
Index: collections/collections-module/src/main/resources/META-INF/resources/editor/cbu/editor-cbu.xed
===================================================================
diff -u -N -r4592 -r4594
--- collections/collections-module/src/main/resources/META-INF/resources/editor/cbu/editor-cbu.xed	(.../editor-cbu.xed)	(revision 4592)
+++ collections/collections-module/src/main/resources/META-INF/resources/editor/cbu/editor-cbu.xed	(.../editor-cbu.xed)	(revision 4594)
@@ -68,7 +68,6 @@
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.bsbink"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.istc"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.bibReference"/>
-    <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.editStatus"/>
 
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.oom_highlightText"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.oom_highlightStatus"/>
@@ -223,7 +222,7 @@
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.bsbink"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.istc"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.bibReference"/>
-    <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.editStatus"/>
+
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.oom_highlightText"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.oom_highlightStatus"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.oom_highlightFrom"/>
@@ -362,7 +361,6 @@
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.gwid"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.bsbink"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.be"/>
-    <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.editStatus"/>
 
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.key"/>
 
@@ -486,7 +484,6 @@
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.gwid"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.bsbink"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.be"/>
-    <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.editStatus"/>
 
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.oom_highlightText"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.oom_highlightStatus"/>
@@ -622,7 +619,6 @@
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.gwid"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.bsbink"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.bibReference"/>
-    <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.editStatus"/>
 
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.key"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="def.license"/>
@@ -756,7 +752,6 @@
     <editor:template name="title" i18n="metaData.hwu.headline4"/>
 
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.languagePrints"/>
-    <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.editStatus"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.applications"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.transcription"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.typeface"/>
@@ -900,7 +895,6 @@
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.ppn"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.ppnDigital"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.ppnGbv"/>
-    <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.editStatus"/>
 
     <xed:bind xpath="def.typeOfUnit[@class='MCRMetaClassification']">
       <xed:bind xpath="@heritable" initially="false"/>
@@ -1002,7 +996,6 @@
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.ppn"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.ppnDigital"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.ppnGbv"/>
-    <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.editStatus"/>
 
     <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="def.license"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="servstate"/>
@@ -1166,7 +1159,6 @@
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.bsbink"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.identifier.istc"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.bibReference"/>
-    <xed:include uri="xslStyle:editor-template:webapp:editor/cbu/editor-cbu-commons.xed" ref="def.editStatus"/>
 
     <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="def.license"/>
     <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="servstate"/>
Index: collections/collections-module/src/main/resources/xsl/metadata/mycoreobject-tei.xsl
===================================================================
diff -u -N -r3737 -r4594
--- collections/collections-module/src/main/resources/xsl/metadata/mycoreobject-tei.xsl	(.../mycoreobject-tei.xsl)	(revision 3737)
+++ collections/collections-module/src/main/resources/xsl/metadata/mycoreobject-tei.xsl	(.../mycoreobject-tei.xsl)	(revision 4594)
@@ -137,10 +137,10 @@
                             select="concat($WebApplicationBaseURL, 'receive/', @xlink:href)"/>
                   </note>
                 </xsl:for-each>
-                <xsl:if test="metadata/def.editStatus/editStatus">
+                <xsl:if test="//servstates/servstate/@categid">
                   <note type="remarkDocument" subtype="editingStatus">
                     <xsl:for-each
-                            select="metadata/def.editStatus[@class='MCRMetaClassification']/editStatus">
+                            select="//servstates/servstate">
                       <xsl:value-of select="mcrxsl:getDisplayName(@classid, @categid)"/>
                     </xsl:for-each>
                   </note>
Index: collections/collections-module/src/main/resources/xsl/metadata/imgitem.xsl
===================================================================
diff -u -N -r4017 -r4594
--- collections/collections-module/src/main/resources/xsl/metadata/imgitem.xsl	(.../imgitem.xsl)	(revision 4017)
+++ collections/collections-module/src/main/resources/xsl/metadata/imgitem.xsl	(.../imgitem.xsl)	(revision 4594)
@@ -292,12 +292,6 @@
                   <xsl:with-param select="i18n:translate('metaData.map.keywords')" name="label"/>
                 </xsl:call-template>
 
-                <!--xx***edit status************************************* -->
-                <xsl:call-template name="printMetaDate">
-                  <xsl:with-param select="./metadata/def.editStatus/editStatus" name="nodes"/>
-                  <xsl:with-param select="i18n:translate('metaData.common.editStatus')" name="label"/>
-                </xsl:call-template>
-
                 <!--32***license*************************************** -->
                 <xsl:call-template name="printLicence">
                   <xsl:with-param select="./metadata/def.license/license" name="nodes"/>
Index: collections/collections-module/src/main/resources/META-INF/resources/editor/page/editor-page.xed
===================================================================
diff -u -N -r4592 -r4594
--- collections/collections-module/src/main/resources/META-INF/resources/editor/page/editor-page.xed	(.../editor-page.xed)	(revision 4592)
+++ collections/collections-module/src/main/resources/META-INF/resources/editor/page/editor-page.xed	(.../editor-page.xed)	(revision 4594)
@@ -1,67 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xed:template xmlns:xed="http://www.mycore.de/xeditor" xmlns:editor="http://www.thulb.uni-jena.de/urmel">
   <xed:template id="edit_page_structure">
-    <xed:include uri="xslStyle:editor-template:webapp:/editor/editor-common.xed" ref="parentOutputDefault" />
+    <xed:include uri="xslStyle:editor-template:webapp:/editor/editor-common.xed" ref="parentOutputDefault"/>
   </xed:template>
 
   <xed:template id="edit_page">
     <editor:template name="textInput"
-      xpath="def.leaf[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/leaf[@inherited='0'][@form='plain']"
-      maxlength="512" i18n="metaData.page.leaf" validation="required" error="editor.error.page.leaf" buttons="false" />
+                     xpath="def.leaf[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']/leaf[@inherited='0'][@form='plain']"
+                     maxlength="512" i18n="metaData.page.leaf" validation="required" error="editor.error.page.leaf" buttons="false"/>
 
     <xed:repeat xpath="def.place[@class='MCRMetaXML'][@heritable='false'][@notinherit='false']/place[@inherited='0']"
-      min="1" max="100">
+                min="1" max="100">
       <xed:validate display="here"
-        test="(string-length(gnd) &gt; 0) or (string-length(name) &gt; 0) or (string-length(date) &gt; 0) or (string-length(latitude) &gt; 0) or (string-length(longitude) &gt; 0)">
-        <editor:template name='validate-message' error="editor.error.page.place" />
+                    test="(string-length(gnd) &gt; 0) or (string-length(name) &gt; 0) or (string-length(date) &gt; 0) or (string-length(latitude) &gt; 0) or (string-length(longitude) &gt; 0)">
+        <editor:template name='validate-message' error="editor.error.page.place"/>
       </xed:validate>
       <editor:template name="textInputSm" xpath="." i18n="metaData.page.place" class="fixContainer fixPagePlaceContainer"
-        marker="required" buttons="true">
-        <xed:bind xpath="gnd" >
+                       marker="required" buttons="true">
+        <xed:bind xpath="gnd">
           <editor:template name="textInput" xpath="." i18n="metaData.page.gnd" maxlength="256"
-            buttons="false" validation="." />
+                           buttons="false" validation="."/>
           <xed:validate display="local" matches="\p{Digit}+[-]*\p{Digit}*\p{Alnum}*">
-            <editor:template name='validate-message' error="editor.error.page.place.gnd" />
+            <editor:template name='validate-message' error="editor.error.page.place.gnd"/>
           </xed:validate>
         </xed:bind>
         <editor:template name="textInput" xpath="name" i18n="metaData.page.name" maxlength="256"
-          buttons="false" />
+                         buttons="false"/>
         <editor:template name="textInput" xpath="date" i18n="metaData.page.date" maxlength="12"
-          buttons="false" validation="date" error="editor.error.date" />
+                         buttons="false" validation="date" error="editor.error.date"/>
         <editor:template name="textInput" xpath="latitude" i18n="metaData.page.latitude" maxlength="12"
-          buttons="false" validation="latitude" error="editor.error.page.place.latitude" />
+                         buttons="false" validation="latitude" error="editor.error.page.place.latitude"/>
         <editor:template name="textInput" xpath="longitude" i18n="metaData.page.longitude" maxlength="12"
-          buttons="false" validation="longitude" error="editor.error.page.place.longitude" />
+                         buttons="false" validation="longitude" error="editor.error.page.place.longitude"/>
       </editor:template>
     </xed:repeat>
 
-    <xed:include uri="xslStyle:editor-template:webapp:/editor/editor-common.xed" ref="def.note.false.true" />
+    <xed:include uri="xslStyle:editor-template:webapp:/editor/editor-common.xed" ref="def.note.false.true"/>
 
     <xed:bind xpath="def.placeGeneral[@class='MCRMetaLangText'][@heritable='false'][@notinherit='true']">
       <xed:repeat xpath="placeGeneral[@type='gnd'][@inherited='0']" min="0" max="100">
         <editor:template name="textInput" xpath="." i18n="metaData.page.place_gnd" maxlength="512"
-          buttons="true" />
+                         buttons="true"/>
       </xed:repeat>
       <xed:repeat xpath="placeGeneral[@type='name'][@inherited='0']" min="0" max="100">
         <editor:template name="textInput" xpath="." i18n="metaData.page.placeGeneral_name" maxlength="512"
-          buttons="true" />
+                         buttons="true"/>
       </xed:repeat>
     </xed:bind>
 
     <xed:repeat
-      xpath="def.derivateLink[@class='MCRMetaDerivateLink'][@heritable='false'][@notinherit='true']/derivateLink[@inherited='0'][@xlink:type='locator']"
-      min="0" max="1">
+        xpath="def.derivateLink[@class='MCRMetaDerivateLink'][@heritable='false'][@notinherit='true']/derivateLink[@inherited='0'][@xlink:type='locator']"
+        min="0" max="1">
       <editor:template name="subselect" xpath="." i18n="metaData.cbu.editor.derivates.linkLabel" area="data_files" data-parent="{//parents/parent/@xlink:href}"
-        btni18n="editor.search.choose.derivate" buttons="true" location="here" />
-      <editor:template name="textArea" xpath="annotation[@xml:lang='de']" buttons="false" />
+                       btni18n="editor.search.choose.derivate" buttons="true" location="here"/>
+      <editor:template name="textArea" xpath="annotation[@xml:lang='de']" buttons="false"/>
     </xed:repeat>
 
-    <editor:template name="select"
-      xpath="def.editStatus[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/editStatus[@inherited='0'][@classid='editStatus']/@categid"
-      classification="editStatus" i18n="metaData.common.editStatus" noPleaseSelect="option-supplied" cacheable="false">
-      <option value="progress">
-        <xed:output i18n="editor.common.select" />
-      </option>
-    </editor:template>
+    <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="servstate"/>
   </xed:template>
 </xed:template>
Index: collections/collections-module/src/main/resources/config/collections/solr-home/configsets/base/conf/schema.xml
===================================================================
diff -u -N -r4512 -r4594
--- collections/collections-module/src/main/resources/config/collections/solr-home/configsets/base/conf/schema.xml	(.../schema.xml)	(revision 4512)
+++ collections/collections-module/src/main/resources/config/collections/solr-home/configsets/base/conf/schema.xml	(.../schema.xml)	(revision 4594)
@@ -252,7 +252,6 @@
     <field name="dewey.actual" type="string" multiValued="true"/>
     <copyField source="ddc.categid" dest="dewey.actual"/>
 
-    <field name="editStatus" type="string" multiValued="true"/>
     <field name="state.categid" type="string" multiValued="true"/>
 
     <field name="genre" type="string" multiValued="true"/>
Index: collections/collections-module/src/main/resources/xsl/metadata/showcase.xsl
===================================================================
diff -u -N -r3622 -r4594
--- collections/collections-module/src/main/resources/xsl/metadata/showcase.xsl	(.../showcase.xsl)	(revision 3622)
+++ collections/collections-module/src/main/resources/xsl/metadata/showcase.xsl	(.../showcase.xsl)	(revision 4594)
@@ -220,13 +220,6 @@
                   <xsl:with-param select="./metadata/def.entitylink/entitylink[@type='editor']" name="nodes"/>
                   <xsl:with-param select="i18n:translate('metaData.showcase.entitylink')" name="label"/>
                 </xsl:call-template>
-                <!--18***editStatus************************************* -->
-                <xsl:if test="not(./metadata/def.editStatus/editStatus[@categid='finished'])">
-                  <xsl:call-template name="printMetaDate">
-                    <xsl:with-param select="./metadata/def.editStatus/editStatus" name="nodes"/>
-                    <xsl:with-param select="i18n:translate('metaData.showcase.editStatus')" name="label"/>
-                  </xsl:call-template>
-                </xsl:if>
 
                 <!--*** Editor Buttons ************************************* -->
                 <xsl:call-template name="collections.edit">
Index: collections/collections-module/src/main/resources/META-INF/resources/editor/visitation/editor-visitation.xed
===================================================================
diff -u -N -r4592 -r4594
--- collections/collections-module/src/main/resources/META-INF/resources/editor/visitation/editor-visitation.xed	(.../editor-visitation.xed)	(revision 4592)
+++ collections/collections-module/src/main/resources/META-INF/resources/editor/visitation/editor-visitation.xed	(.../editor-visitation.xed)	(revision 4594)
@@ -116,12 +116,6 @@
                         cacheable="false" buttons="true" validation="required" error="editor.error.visitation.key"/>
     </xed:repeat>
 
-    <editor:template name="select"
-                      xpath="def.editStatus[@class='MCRMetaClassification'][@heritable='false'][@notinherit='true']/editStatus[@inherited='0'][@classid='editStatus']/@categid"
-                      classification="editStatus" i18n="metaData.common.editStatus" noPleaseSelect="option-supplied" cacheable="false">
-      <option value="progress">
-        <xed:output i18n="editor.common.select"/>
-      </option>
-    </editor:template>
+    <xed:include uri="xslStyle:editor-template:webapp:editor/editor-common.xed" ref="servstate"/>
   </xed:template>
 </xed:template>
Index: collections/collections-module/src/main/datamodel/def/cbu.xml
===================================================================
diff -u -N -r4149 -r4594
--- collections/collections-module/src/main/datamodel/def/cbu.xml	(.../cbu.xml)	(revision 4149)
+++ collections/collections-module/src/main/datamodel/def/cbu.xml	(.../cbu.xml)	(revision 4594)
@@ -164,10 +164,6 @@
              style="small" notinherit="ignore" heritable="ignore"/>
     <element name="printview" type="xml" minOccurs="0" maxOccurs="unbounded"
              style="dontknow" notinherit="ignore" heritable="ignore"/>
-    <element name="editStatus" type="classification" minOccurs="0"
-             maxOccurs="unbounded" style="select" notinherit="ignore" heritable="ignore">
-      <classification id="editStatus"/>
-    </element>
     <element name="ddc" type="classification" minOccurs="0"
              maxOccurs="unbounded" style="select" notinherit="ignore" heritable="ignore">
       <classification id="dewey"/>