diff --git a/src/main/resources/xsl/response-facets.xsl b/src/main/resources/xsl/response-facets.xsl
new file mode 100644
index 0000000..7306d27
--- /dev/null
+++ b/src/main/resources/xsl/response-facets.xsl
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xalan="http://xml.apache.org/xalan"
+  xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation"
+  xmlns:encoder="xalan://java.net.URLEncoder"
+  xmlns:str="xalan://java.lang.String"
+  xmlns:mcrxml="xalan://org.mycore.common.xml.MCRXMLFunctions"
+  exclude-result-prefixes="xsl xalan i18n encoder mcrxml str">
+
+<xsl:param name="RequestURL" />
+<xsl:param name="ServletsBaseURL" />
+
+<xsl:variable name="maxFacetValuesDisplayed">5</xsl:variable>
+<xsl:variable name="quotes">"</xsl:variable>
+<xsl:variable name="fq_not">-</xsl:variable>
+
+<xsl:template match="lst[@name='facet_counts']">
+  <xsl:apply-templates select="../lst[@name='responseHeader']/lst[@name='params']" mode="fq" />
+  <xsl:apply-templates select="lst[@name='facet_fields']/lst[int]" />
+</xsl:template>
+
+<!-- List currently active filter queries -->
+<xsl:template match="lst[@name='responseHeader']/lst[@name='params']" mode="fq">
+  <xsl:variable name="hasActiveFilters" select="boolean(*[@name='fq'])" />
+  <article class="card mb-3">
+    <div class="card-body">
+      <hgroup>
+        <h3>
+          <xsl:value-of select="i18n:translate(concat('facets.filters.',$hasActiveFilters))" />
+        </h3>
+      </hgroup>
+      <xsl:if test="$hasActiveFilters">
+        <ul class="list-group">
+          <xsl:for-each select="*[@name='fq']/descendant-or-self::str">
+
+            <xsl:variable name="fq" select="text()" />
+
+            <xsl:variable name="removeURL">
+              <xsl:text>select?</xsl:text>
+              <xsl:for-each select="/response/lst[@name='responseHeader']/lst[@name='params']/*">
+                <xsl:variable name="param_name" select="@name" />
+                <xsl:for-each select="descendant-or-self::str"> <!-- may be an array: arr/str or ./str -->
+                  <xsl:choose>
+                    <xsl:when test="$param_name='start'" />
+                    <xsl:when test="($param_name='fq') and (text()=$fq)" /> <!--  remove this -->
+                    <xsl:otherwise>
+                      <xsl:value-of select="$param_name" />
+                      <xsl:text>=</xsl:text>
+                      <xsl:value-of select="encoder:encode(text(),'UTF-8')" />
+                      <xsl:text>&amp;</xsl:text>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:for-each>
+              </xsl:for-each>
+              <xsl:text>start=0</xsl:text>
+            </xsl:variable>
+
+            <xsl:variable name="fq_without_quotes" select="str:replaceAll(str:new($fq),$quotes,'')" />
+
+            <li class="mycore-list-item">
+              <a class="mycore-facet-remove" href="{$removeURL}">
+                <span class="far fa-times-circle" aria-hidden="true" />
+              </a>
+              <span class="mycore-facet-filter">
+                <xsl:choose>
+                  <xsl:when test="starts-with($fq_without_quotes,$fq_not)">
+                    <xsl:variable name="fq_without_not" select="substring-after($fq_without_quotes,'-')" />
+                    <xsl:call-template name="output.facet.value">
+                      <xsl:with-param name="prefix" select="concat(i18n:translate('facets.filters.not'),' ')" />
+                      <xsl:with-param name="type"  select="substring-before($fq_without_not,':')" />
+                      <xsl:with-param name="value" select="substring-after($fq_without_not,':')" />
+                    </xsl:call-template>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:call-template name="output.facet.value">
+                      <xsl:with-param name="type"  select="substring-before($fq_without_quotes,':')" />
+                      <xsl:with-param name="value" select="substring-after($fq_without_quotes,':')" />
+                    </xsl:call-template>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </span>
+            </li>
+          </xsl:for-each>
+        </ul>
+      </xsl:if>
+    </div>
+  </article>
+</xsl:template>
+
+<xsl:variable name="permission.admin" xmlns:check="xalan://org.mycore.ubo.AccessControl" select="check:currentUserIsAdmin()" />
+
+<!-- List a facet -->
+<xsl:template match="lst[@name='facet_fields']/lst[int]">
+  <xsl:choose>
+    <xsl:when test="(@name='status') and not($permission.admin)" /> <!-- do not show status facet if not admin -->
+    <xsl:when test="(@name='importID') and not($permission.admin)" /> <!-- do not show importID facet if not admin -->
+    <xsl:otherwise>
+      <xsl:call-template name="display.facet" />
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="display.facet">
+  <xsl:variable name="max">
+    <xsl:for-each select="int">
+      <xsl:sort select="text()" data-type="number" order="descending"/>
+      <xsl:if test="position() = 1"><xsl:value-of select="string-length(text())"/></xsl:if>
+    </xsl:for-each>
+  </xsl:variable>
+  <article class="card mb-3">
+    <div class="card-body">
+      <hgroup>
+        <h3><xsl:value-of select="i18n:translate(concat('facets.facet.',str:replaceAll(str:new(@name),'facet_','')))" /></h3>
+      </hgroup>
+      <ul id="{generate-id(.)}" class="list-group counter-length-{$max}">
+        <xsl:choose>
+          <xsl:when test="@name='year'"> <!-- sort year facets by year, descending -->
+            <xsl:apply-templates select="int" mode="facets">
+              <xsl:sort select="@name" data-type="number" order="descending" />
+            </xsl:apply-templates>
+          </xsl:when>
+          <xsl:otherwise> <!-- sort other facets by facet count, descending -->
+            <xsl:apply-templates select="int" mode="facets">
+              <xsl:sort select="text()" data-type="number" order="descending" />
+            </xsl:apply-templates>
+          </xsl:otherwise>
+        </xsl:choose>
+      </ul>
+      <xsl:variable name="numMore" select="count(int) - number($maxFacetValuesDisplayed)" />
+      <xsl:if test="$numMore &gt; 0">
+	<div class="float-right mycore-slidetoggle">
+          <a class="mycore-facets-toggle" id="tg{generate-id(.)}" onclick="$('ul#{generate-id(.)} li:gt({$maxFacetValuesDisplayed - 1})').slideToggle(); $('a#tg{generate-id(.)} span').toggle();">
+            <span><xsl:value-of select="concat($numMore,' ',i18n:translate('facets.toggle.more'))" /></span>
+            <span style="display:none;"><xsl:value-of select="i18n:translate('facets.toggle.less')" /></span>
+            <xsl:text>...</xsl:text>
+          </a>
+	</div>
+      </xsl:if>
+    </div>
+  </article>
+</xsl:template>
+
+<!-- URL to build links to add a facet filter query -->
+<xsl:variable name="baseURL">
+  <xsl:text>select?</xsl:text>
+  <xsl:for-each select="/response/lst[@name='responseHeader']/lst[@name='params']/*">
+    <xsl:variable name="name" select="@name" />
+    <xsl:for-each select="descendant-or-self::str"> <!-- may be an array: arr/str or ./str -->
+      <xsl:choose>
+        <xsl:when test="$name='start'" />
+        <xsl:otherwise>
+          <xsl:value-of select="$name" />
+          <xsl:text>=</xsl:text>
+          <xsl:value-of select="encoder:encode(text(),'UTF-8')" />
+          <xsl:text>&amp;</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+  </xsl:for-each>
+  <xsl:text>start=0&amp;fq=</xsl:text>
+</xsl:variable>
+
+<!-- Output single facet value -->
+<xsl:template match="lst[@name='facet_fields']/lst/int" mode="facets">
+  <li class="mycore-list-item">
+    <xsl:if test="position() &gt; number($maxFacetValuesDisplayed)">
+      <xsl:attribute name="style">display:none;</xsl:attribute>
+    </xsl:if>
+    <span class="mycore-facet-count">
+      <xsl:value-of select="text()" />
+    </span>
+    <xsl:variable name="fq" select="encoder:encode(concat(../@name,':',$quotes,@name,$quotes),'UTF-8')" />
+    <xsl:choose>
+      <xsl:when test="number(text()) &lt; number($numFound)"> <!-- When count = 100%, filtering makes no sense -->
+        <a class="mycore-facet-exclude" href="{$baseURL}{encoder:encode($fq_not)}{$fq}"> <!-- Link to exclude this facet value -->
+          <span class="far fa-times-circle" aria-hidden="true" />
+        </a>
+        <a class="mycore-facet-add" href="{$baseURL}{$fq}">
+          <span class="mycore-facet-value">
+            <xsl:call-template name="output.facet.value">
+              <xsl:with-param name="type"  select="../@name" />
+              <xsl:with-param name="value" select="@name"/>
+            </xsl:call-template>
+          </span>
+        </a>
+      </xsl:when>
+      <xsl:otherwise>
+        <span class="mycore-facet-exclude" />
+        <span class="mycore-facet-value">
+          <xsl:call-template name="output.facet.value">
+            <xsl:with-param name="type"  select="../@name" />
+            <xsl:with-param name="value" select="@name"/>
+          </xsl:call-template>
+        </span>
+      </xsl:otherwise>
+    </xsl:choose>
+  </li>
+</xsl:template>
+
+<!-- Output facet value: some must be translated to a label, e.g. subject, genre -->
+<xsl:template name="output.facet.value">
+  <xsl:param name="prefix"/>
+  <xsl:param name="type"/>
+  <xsl:param name="value"/>
+
+  <xsl:variable name="label">
+    <xsl:value-of select="$prefix"/>
+    <xsl:choose>
+      <xsl:when test="$type='subject'">
+        <xsl:variable name="url">classification:metadata:0:children:fachreferate:<xsl:value-of
+            select="encoder:encode($value,'UTF-8')"/>
+        </xsl:variable>
+        <xsl:value-of select="document($url)/mycoreclass/categories/category[1]/label[@xml:lang=$CurrentLang]/@text"/>
+      </xsl:when>
+      <xsl:when test="$type='oa'">
+        <xsl:value-of select="$oa//category[@ID=$value]/label[lang($CurrentLang)]/@text"/>
+      </xsl:when>
+      <xsl:when test="$type='genre'">
+        <xsl:value-of select="$genres//category[@ID=$value]/label[lang($CurrentLang)]/@text"/>
+      </xsl:when>
+      <xsl:when test="$type='origin_exact'">
+        <xsl:value-of select="$origin//category[@ID=$value]/label[lang($CurrentLang)]/@text"/>
+      </xsl:when>
+      <xsl:when test="$type='status'">
+        <xsl:value-of select="i18n:translate(concat('search.dozbib.status.',$value))"/>
+      </xsl:when>
+      <xsl:when test="$type='partOf'">
+        <xsl:value-of select="i18n:translate(concat('search.dozbib.partOf.', $value))"/>
+      </xsl:when>
+      <xsl:when test="$type='project'">
+        <xsl:value-of select="mcrxml:getDisplayName('project', $value)"/>
+      </xsl:when>
+      <xsl:when test="$type='fundingType'">
+        <xsl:value-of select="mcrxml:getDisplayName('fundingType', $value)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$value"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="fallback-label">
+    <xsl:if test="string-length($label) = 0">
+      <xsl:value-of select="$prefix"/>
+      <xsl:choose>
+        <xsl:when test="$type='subject'">
+          <xsl:variable name="url">classification:metadata:0:children:fachreferate:<xsl:value-of
+              select="encoder:encode($value,'UTF-8')"/>
+          </xsl:variable>
+          <xsl:value-of select="document($url)/mycoreclass/categories/category[1]/label[@xml:lang=$DefaultLang]/@text"/>
+        </xsl:when>
+        <xsl:when test="$type='oa'">
+          <xsl:value-of select="$oa//category[@ID=$value]/label[lang($DefaultLang)]/@text"/>
+        </xsl:when>
+        <xsl:when test="$type='genre'">
+          <xsl:value-of select="$genres//category[@ID=$value]/label[lang($DefaultLang)]/@text"/>
+        </xsl:when>
+        <xsl:when test="$type='peerreviewed'">
+          <xsl:value-of select="$peerreviewed//category[@ID=$value]/label[lang($DefaultLang)]/@text"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$value"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
+  </xsl:variable>
+
+  <span>
+    <xsl:choose>
+      <xsl:when test="string-length($label) ">
+        <xsl:if test="string-length($label) &gt; 20">
+          <xsl:attribute name="class">scroll-on-hover</xsl:attribute>
+        </xsl:if>
+        <xsl:value-of select="$label"/>
+      </xsl:when>
+      <xsl:when test="$label">
+        <xsl:if test="string-length($fallback-label) &gt; 20">
+          <xsl:attribute name="class">scroll-on-hover</xsl:attribute>
+        </xsl:if>
+        <xsl:value-of select="$fallback-label"/>
+      </xsl:when>
+    </xsl:choose>
+  </span>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/main/resources/xsl/response.xsl b/src/main/resources/xsl/response.xsl
index 05f6446..76b0220 100644
--- a/src/main/resources/xsl/response.xsl
+++ b/src/main/resources/xsl/response.xsl
@@ -9,22 +9,21 @@
   xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation"
   xmlns:mods="http://www.loc.gov/mods/v3"
   xmlns:mcr="http://www.mycore.org/"
+  xmlns:mcrxml="xalan://org.mycore.common.xml.MCRXMLFunctions"
   xmlns:encoder="xalan://java.net.URLEncoder"
   xmlns:str="xalan://java.lang.String"
   xmlns:basket="xalan://org.mycore.ubo.basket.BasketUtils"
-  exclude-result-prefixes="xsl xalan i18n mods mcr encoder str basket"
->
+  exclude-result-prefixes="xsl xalan i18n mods mcr mcrxml encoder str basket">
 
 <xsl:include href="mods-display.xsl" />
 <xsl:include href="response-facets.xsl" />
+<xsl:include href="ubo-dialog.xsl" />
 <xsl:include href="coreFunctions.xsl" />
 <xsl:include href="csl-export-gui.xsl" />
 
 <xsl:param name="RequestURL" />
-<xsl:param name="MCR.ORCID.OAuth.ClientSecret" select="''" />
-<xsl:param name="MCR.ORCID.OAuth.Scopes" select="''" />
-<xsl:param name="CurrentUser" />
-<xsl:param name="MCR.Users.Guestuser.UserName" />
+<xsl:param name="MCR.ORCID2.OAuth.ClientSecret" select="''" />
+<xsl:param name="MCR.ORCID2.OAuth.Scope" select="''" />
 
 <!-- ==================== Trefferliste Metadaten ==================== -->
 
@@ -110,8 +109,18 @@
   <html id="dozbib.search">
     <head>
       <xsl:call-template name="page.title" />
-      <xsl:if test="string-length($MCR.ORCID.OAuth.ClientSecret) &gt; 0 and contains($MCR.ORCID.OAuth.Scopes,'update')">
-        <script src="{$WebApplicationBaseURL}js/mycore2orcid.js" />
+      <xsl:if test="not(mcrxml:isCurrentUserGuestUser()) and string-length($MCR.ORCID2.OAuth.ClientSecret) &gt; 0 and contains($MCR.ORCID2.OAuth.Scope,'update')">
+
+        <xsl:call-template name="notification-dialog">
+          <xsl:with-param name="id" select="'success'"/>
+          <xsl:with-param name="title" select="'⚠'"/>
+          <xsl:with-param name="message" select="i18n:translate('orcid.publication.action.confirmation')"/>
+        </xsl:call-template>
+        <xsl:call-template name="notification-dialog">
+          <xsl:with-param name="id" select="'fail'"/>
+          <xsl:with-param name="title" select="'⚠'"/>
+          <xsl:with-param name="message" select="i18n:translate('upload.failed')"/>
+        </xsl:call-template>
       </xsl:if>
     </head>
     <body>
@@ -216,7 +225,7 @@
       </nav>
     </div>
 
-    <xsl:if test="$CurrentUser != $MCR.Users.Guestuser.UserName">
+    <xsl:if test="not(mcrxml:isCurrentUserGuestUser())">
       <div class="col-2 text-right">
         <span class="pageLink">
           <a class="btn btn-sm btn-secondary" href="statistics?{$exportParams}&amp;XSL.Style=statistics"><xsl:value-of select="i18n:translate('button.statistics')" /></a>
@@ -275,7 +284,7 @@
           <xsl:call-template name="label-year" />
           <xsl:call-template name="pubtype" />
           <xsl:call-template name="label-oa" />
-          <xsl:if test="string-length($MCR.ORCID.OAuth.ClientSecret) &gt; 0 and contains($MCR.ORCID.OAuth.Scopes,'update')">
+          <xsl:if test="string-length($MCR.ORCID2.OAuth.ClientSecret) &gt; 0 and contains($MCR.ORCID2.OAuth.Scope,'update')">
             <xsl:call-template name="orcid-status" />
           </xsl:if>
         </div>
@@ -290,7 +299,7 @@
             <xsl:call-template name="bibentry.add.to.basket" />
           </xsl:if>
           <xsl:call-template name="bibentry.subselect.return" />
-          <xsl:if test="string-length($MCR.ORCID.OAuth.ClientSecret) &gt; 0 and contains($MCR.ORCID.OAuth.Scopes,'update')">
+          <xsl:if test="string-length($MCR.ORCID2.OAuth.ClientSecret) &gt; 0 and contains($MCR.ORCID2.OAuth.Scope,'update')">
             <xsl:call-template name="orcid-publish" />
           </xsl:if>
           <span class="float-right"># <xsl:value-of select="$hitNo"/></span>
diff --git a/src/main/resources/xsl/ubo-solr.xsl b/src/main/resources/xsl/ubo-solr.xsl
index 1f55087..f76de91 100644
--- a/src/main/resources/xsl/ubo-solr.xsl
+++ b/src/main/resources/xsl/ubo-solr.xsl
@@ -9,10 +9,12 @@
   exclude-result-prefixes="mods xlink str mcrxml">
 
   <xsl:import href="xslImport:solr-document:ubo-solr.xsl" />
+  <xsl:include href="coreFunctions.xsl"/>
 
   <xsl:template match="mycoreobject">
     <xsl:apply-templates select="." mode="baseFields" />
     <xsl:call-template   name="documentID" />
+    <xsl:apply-templates select="structure/parents/parent[@xlink:href]" mode="solrField" />
     <xsl:apply-templates select="service/servflags/servflag[@type='status']" mode="solrField" />
     <xsl:apply-templates select="service/servflags/servflag[@type='importID']" mode="solrField" />
     <xsl:apply-templates select="metadata/def.modsContainer/modsContainer/mods:mods" mode="solrField" />
@@ -42,9 +44,12 @@
     <xsl:apply-templates select="mods:name[@type='personal'][mods:role/mods:roleTerm[@type='code'][contains('aut cre tch pht prg edt ivr ive inv',text())]]" mode="solrField.ae_person" />
     <xsl:apply-templates select="descendant::mods:name[@type='personal']" mode="child" />
     <xsl:apply-templates select="mods:genre[@type='intern']" mode="solrField" />
+    <xsl:apply-templates select="mods:accessCondition[@classID='licenses']" mode="solrField" />
     <xsl:apply-templates select="mods:relatedItem[@type='host']/mods:genre[@type='intern']" mode="solrField" />
     <xsl:apply-templates select="mods:classification[contains(@authorityURI,'ORIGIN')]" mode="solrField" />
     <xsl:apply-templates select="mods:classification[contains(@authorityURI,'fachreferate')]" mode="solrField" />
+    <xsl:apply-templates select="mods:classification[contains(@authorityURI,'project')]" mode="solrField" />
+    <xsl:apply-templates select="mods:classification[contains(@authorityURI,'fundingType')]" mode="solrField" />
     <xsl:apply-templates select="mods:relatedItem[@type='host']/mods:titleInfo[not(@type)]" mode="solrField.host" />
     <xsl:apply-templates select="mods:relatedItem[@type='host'][mods:genre='journal']/mods:titleInfo" mode="solrField" />
     <xsl:apply-templates select="mods:relatedItem[@type='host']/mods:part" mode="solrField" />
@@ -190,6 +195,13 @@
     <field name="nid_{@type}">
       <xsl:value-of select="text()" />
     </field>
+
+    <field name="{@type}_nid_text">
+      <xsl:value-of select="../mods:namePart[@type='family']" />
+      <xsl:for-each select="../mods:namePart[@type='given'][1]">
+        <xsl:value-of select="concat(', ',text())" />
+      </xsl:for-each>
+    </field>
   </xsl:template>
 
   <xsl:template match="mods:name[mods:nameIdentifier[@type='lsf']]" mode="solrField.lsf">
@@ -266,6 +278,12 @@
     </field>
   </xsl:template>
 
+  <xsl:template match="mods:accessCondition[@classID='licenses']" mode="solrField">
+    <field name="license">
+      <xsl:value-of select="text()" />
+    </field>
+  </xsl:template>
+
   <xsl:template match="mods:relatedItem[@type='host']/mods:genre[@type='intern']" mode="solrField">
     <field name="host_genre">
       <xsl:value-of select="text()" />
@@ -287,6 +305,27 @@
     <field name="origin_exact">
       <xsl:value-of select="$category" />
     </field>
+
+    <!-- Derive destatis from origin if fachreferate is not set ->
+    <xsl:if test="not (../mods:classification[contains(@authorityURI,'fachreferate')])">
+      <xsl:variable name="origin" select="document('classification:metadata:-1:children:ORIGIN')/mycoreclass/categories" />
+      <xsl:variable name="destatis-attr" select="$origin//category[@ID = $category]/label[@xml:lang = 'x-destatis']/@text"/>
+
+      <xsl:if test="string-length($destatis-attr &gt; 0)">
+        <xsl:variable name="destatis-categories">
+          <xsl:call-template name="Tokenizer">
+            <xsl:with-param name="string" select="$destatis-attr"/>
+          </xsl:call-template>
+        </xsl:variable>
+
+        <xsl:for-each select="xalan:nodeset($destatis-categories)/token">
+          <field name="subject">
+            <xsl:value-of select="."/>
+          </field>
+        </xsl:for-each>
+      </xsl:if -->
+
+    </xsl:if>
   </xsl:template>
 
   <xsl:template name="oa">
@@ -312,6 +351,24 @@
     </xsl:for-each>
   </xsl:template>
 
+  <xsl:template match="mods:classification[contains(@authorityURI,'fachreferate')]" mode="solrField">
+    <field name="subject">
+      <xsl:value-of select="substring-after(@valueURI,'#')" />
+    </field>
+  </xsl:template>
+
+  <xsl:template match="mods:classification[contains(@authorityURI,'project')]" mode="solrField">
+    <field name="project">
+      <xsl:value-of select="substring-after(@valueURI,'#')" />
+    </field>
+  </xsl:template>
+
+  <xsl:template match="mods:classification[contains(@authorityURI,'fundingType')]" mode="solrField">
+    <field name="fundingType">
+      <xsl:value-of select="substring-after(@valueURI,'#')" />
+    </field>
+  </xsl:template>
+
   <xsl:template match="mods:classification[contains(@authorityURI,'accessrights')]" mode="solrField">
     <field name="koeln_accessrights">
       <xsl:value-of select="substring-after(@valueURI,'#')" />
@@ -355,12 +412,6 @@
     </field>
   </xsl:template>
 
-  <xsl:template match="mods:classification[contains(@authorityURI,'fachreferate')]" mode="solrField">
-    <field name="subject">
-      <xsl:value-of select="substring-after(@valueURI,'#')" />
-    </field>
-  </xsl:template>
-
   <xsl:template match="mods:dateIssued" mode="solrField">
     <xsl:variable name="yearIssued">
       <xsl:choose>
@@ -448,6 +499,12 @@
   </xsl:template>
 
   <xsl:template match="mods:note" mode="solrField">
+    <xsl:if test="@type = 'intern'">
+      <field name="note.intern">
+        <xsl:value-of select="text()" />
+      </field>
+    </xsl:if>
+
     <field name="note">
       <xsl:value-of select="text()" />
     </field>
@@ -458,11 +515,6 @@
         <xsl:value-of select="substring(substring-after(.,$before),1,4)" />
       </field>
     </xsl:if>
-    <xsl:if test="@type = 'intern'">
-      <field name="note.intern">
-        <xsl:value-of select="text()" />
-      </field>
-    </xsl:if>
   </xsl:template>
 
   <xsl:template match="mods:abstract" mode="solrField">