diff --git a/src/main/resources/config/reposis_openagrar/solr/main/solr-schema.json b/src/main/resources/config/reposis_openagrar/solr/main/solr-schema.json
index ba0c5bc..b7af4a1 100644
--- a/src/main/resources/config/reposis_openagrar/solr/main/solr-schema.json
+++ b/src/main/resources/config/reposis_openagrar/solr/main/solr-schema.json
@@ -121,12 +121,22 @@
       "multiValued":true
     }
   },
+  {
+    "replace-field": {
+      "name": "mods.mainAuthor",
+      "type": "mods.collatedGERMAN",
+      "indexed": true,
+      "stored": false,
+      "multiValued":true
+    }
+  },
   {
     "add-field": {
       "name": "mods.mainAuthor.affiliation",
       "type": "mods.collatedGERMAN",
       "indexed": true,
-      "stored": false
+      "stored": false,
+      "multiValued":true
     }
   },
   {
@@ -134,7 +144,8 @@
       "name": "mods.coAuthor",
       "type": "mods.collatedGERMAN",
       "indexed": true,
-      "stored": false
+      "stored": false,
+      "multiValued":true
     }
   },
   {
@@ -142,7 +153,8 @@
       "name": "mods.coAuthor.affiliation",
       "type": "mods.collatedGERMAN",
       "indexed": true,
-      "stored": false
+      "stored": false,
+      "multiValued":true
     }
   },
   {
@@ -150,7 +162,8 @@
       "name": "mods.correspondingAuthor",
       "type": "mods.collatedGERMAN",
       "indexed": true,
-      "stored": false
+      "stored": false,
+      "multiValued":true
     }
   },
   {
@@ -158,7 +171,8 @@
       "name": "mods.correspondingAuthor.affiliation",
       "type": "mods.collatedGERMAN",
       "indexed": true,
-      "stored": false
+      "stored": false,
+      "multiValued":true
     }
   },
   {
@@ -166,7 +180,8 @@
       "name": "mods.lastAuthor",
       "type": "mods.collatedGERMAN",
       "indexed": true,
-      "stored": false
+      "stored": false,
+      "multiValued":true
     }
   },
   {
@@ -174,7 +189,8 @@
       "name": "mods.lastAuthor.affiliation",
       "type": "mods.collatedGERMAN",
       "indexed": true,
-      "stored": false
+      "stored": false,
+      "multiValued":true
     }
   },
   {
diff --git a/src/main/resources/xsl/migration/mycoreobject-remove-single-altRepGroup.xsl b/src/main/resources/xsl/migration/mycoreobject-remove-single-altRepGroup.xsl
index 6f20e64..4f4404e 100644
--- a/src/main/resources/xsl/migration/mycoreobject-remove-single-altRepGroup.xsl
+++ b/src/main/resources/xsl/migration/mycoreobject-remove-single-altRepGroup.xsl
@@ -4,20 +4,8 @@
     xmlns:mods="http://www.loc.gov/mods/v3"
     xmlns:xlink="http://www.w3.org/1999/xlink">
 
-  <xsl:template match="mods:mods/mods:*[string-length(@altRepGroup) &gt; 0]">
-    <xsl:variable name="altRepGroup" select="@altRepGroup"/>
-    <xsl:choose>
-      <xsl:when test="count(../*[@altRepGroup = $altRepGroup]) = 1">
-        <xsl:copy >
-          <xsl:apply-templates select="node()|@*[local-name() != 'altRepGroup']"/>
-        </xsl:copy>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy >
-          <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-      </xsl:otherwise>
-    </xsl:choose>
+  <xsl:template match="classification[@classid='mir_access']">
+    
   </xsl:template>
 
     <!-- copy from copynodes.xsl -->
diff --git a/src/main/resources/xsl/openagrar-solr.xsl b/src/main/resources/xsl/openagrar-solr.xsl
index 4a99e04..7199f0c 100644
--- a/src/main/resources/xsl/openagrar-solr.xsl
+++ b/src/main/resources/xsl/openagrar-solr.xsl
@@ -47,32 +47,50 @@
         <xsl:value-of select="." />
       </field>
     </xsl:for-each>
-    <xsl:for-each
-      select="mods:name[mods:role/mods:roleTerm[@authority='marcrelator' and (@type='text' and text()='author') or (@type='code' and text()='aut')]]">
+    <xsl:for-each select="mods:name[mods:role/mods:roleTerm[@authority='marcrelator' and (@type='text' and text()='author') or (@type='code' and text()='aut')]]">
       <xsl:choose>
         <xsl:when test="not(../mods:name/mods:role/mods:roleTerm[contains(@valueURI, '#')])">
           <xsl:variable name="autrole">
             <xsl:choose>
               <xsl:when test="position()=1">
                 <xsl:text>mainAuthor</xsl:text>
-              </xsl:when>	
+              </xsl:when>
               <xsl:when test="position()=last()">
                 <xsl:text>lastAuthor</xsl:text>
               </xsl:when>
               <xsl:otherwise>
-               <xsl:text>noRole</xsl:text>
+                <xsl:text>noRole</xsl:text>
               </xsl:otherwise>
             </xsl:choose>
-          </xsl:variable>						
+          </xsl:variable>
           <xsl:if test="$autrole != 'noRole'">
             <field name="{concat('mods.', $autrole)}">
-              <xsl:for-each select="mods:displayForm | mods:namePart | text()">
-                <xsl:value-of select="concat(' ',mcrxsl:normalizeUnicode(.))" />
-              </xsl:for-each>
-            </field>
-            <field name="{concat('mods.', $autrole, '.affiliation')}">
-              <xsl:value-of select="mods:affiliation" />
+              <xsl:choose>
+                <xsl:when test="mods:displayForm">
+                  <xsl:value-of select="mcrxsl:normalizeUnicode(mods:displayForm)" />
+                </xsl:when>
+                <xsl:when test="mods:namePart">
+                  <xsl:for-each select="mods:namePart">
+                    <xsl:choose>
+                      <xsl:when test="@type='family'">
+                        <xsl:value-of select="concat(mcrxsl:normalizeUnicode(.), ',')" />
+                      </xsl:when>
+                      <xsl:when test="@type='given'">
+                        <xsl:value-of select="concat(' ',mcrxsl:normalizeUnicode(.))" />
+                      </xsl:when>
+                      <xsl:otherwise>
+                        <xsl:value-of select="concat(mcrxsl:normalizeUnicode(.), ' ')" />
+                      </xsl:otherwise>
+                    </xsl:choose>
+                  </xsl:for-each>
+                </xsl:when>
+              </xsl:choose>
             </field>
+            <xsl:if test="mods:affiliation">
+              <field name="{concat('mods.', $autrole, '.affiliation')}">
+                <xsl:value-of select="mods:affiliation" />
+              </field>
+            </xsl:if>
           </xsl:if>
         </xsl:when>
         <xsl:otherwise>
@@ -94,17 +112,38 @@
               </xsl:choose>
             </xsl:variable>
             <field name="{concat('mods.', $autrole)}">
-              <xsl:for-each select="../../mods:displayForm | ../../mods:namePart | ../../text()">
-                <xsl:value-of select="concat(' ',mcrxsl:normalizeUnicode(.))" />
-              </xsl:for-each>
-            </field>
-            <field name="{concat('mods.', $autrole, '.affiliation')}">
-              <xsl:value-of select="../../mods:affiliation" />
+              <xsl:choose>
+                <xsl:when test="../../mods:displayForm">
+                  <xsl:value-of select="mcrxsl:normalizeUnicode(../../mods:displayForm)" />
+                </xsl:when>
+                <xsl:when test="../../mods:namePart[@type='family'] and ../../mods:namePart[@type='given']">
+                  <xsl:for-each select="../../mods:namePart[@type='family']">
+                    <xsl:value-of select="concat(mcrxsl:normalizeUnicode(.), ' ')" />
+                    <xsl:if test="position() != last()">
+                      <xsl:value-of select="' '" />
+                    </xsl:if>
+                  </xsl:for-each>
+                  <xsl:value-of select="','" />
+                  <xsl:for-each select="../../mods:namePart[@type='given']">
+                    <xsl:value-of select="concat(' ',mcrxsl:normalizeUnicode(.))" />
+                  </xsl:for-each>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:for-each select="../../mods:namePart[@type='family' or @type='given']">
+                    <xsl:value-of select="concat(mcrxsl:normalizeUnicode(.), ' ')" />
+                  </xsl:for-each>
+                </xsl:otherwise>
+              </xsl:choose>
             </field>
+            <xsl:if test="../../mods:affiliation">
+              <field name="{concat('mods.', $autrole, '.affiliation')}">
+                <xsl:value-of select="../../mods:affiliation" />
+              </field>
+            </xsl:if>
           </xsl:for-each>
         </xsl:otherwise>
       </xsl:choose>
-    </xsl:for-each> 
+    </xsl:for-each>  
     <xsl:for-each select="mods:genre[contains(@authorityURI,'classifications/genres')]">
       <xsl:variable name="genre" select="."/>
       <xsl:if test="not(../mods:relatedItem[@type='host'])">