From c265ade3313f446ddf40d6c89f0cb1fcba22f540 Mon Sep 17 00:00:00 2001
From: adg167c <paul.rochowski@uni-due.de>
Date: Thu, 11 Dec 2025 09:43:31 +0100
Subject: [PATCH 1/8] Use same versioning as mir-parent

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9bbe0dd..fdfd5b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,6 @@
     <version>2023.06.4-SNAPSHOT</version>
   </parent>
   <artifactId>mir-navigation-plugin</artifactId>
-  <version>2023.06-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>mir-navigation-plugin</name>
   <description>Navigation on series plugin for MyCoRe/MODS Institutional Repository</description>

From ff5ffcd0a5505517dd44f66463a14f420c0a1573 Mon Sep 17 00:00:00 2001
From: adg167c <paul.rochowski@uni-due.de>
Date: Fri, 9 Jan 2026 11:31:14 +0100
Subject: [PATCH 2/8] prepare for next development iteration
 (2023.06.5-SNAPSHOT)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fdfd5b8..d37a46f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.mycore.mir</groupId>
     <artifactId>mir-parent</artifactId>
-    <version>2023.06.4-SNAPSHOT</version>
+    <version>2023.06.5-SNAPSHOT</version>
   </parent>
   <artifactId>mir-navigation-plugin</artifactId>
   <packaging>jar</packaging>

From c2d8415074ba70d60c5881d7396f2fb93d406578 Mon Sep 17 00:00:00 2001
From: Lennard Golsch <lennard.golsch@icloud.com>
Date: Fri, 30 Jan 2026 10:26:54 +0100
Subject: [PATCH 3/8] add workflow_dispatch to snapshot release workflow

---
 .github/workflows/maven-publish-snapshot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/maven-publish-snapshot.yml b/.github/workflows/maven-publish-snapshot.yml
index 22d008c..aa792c1 100644
--- a/.github/workflows/maven-publish-snapshot.yml
+++ b/.github/workflows/maven-publish-snapshot.yml
@@ -4,6 +4,7 @@
 name: Maven Snapshot deploy
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - 'main'

From 87060f8904c5be589bc69f309f7a353a4085c759 Mon Sep 17 00:00:00 2001
From: adg167c <paul.rochowski@uni-due.de>
Date: Thu, 5 Feb 2026 12:04:25 +0100
Subject: [PATCH 4/8] use simpler versioning (2023.06-SNAPSHOT instead of
 2023.06.5-SNAPSHOT)

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index d37a46f..9dd8b02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
     <version>2023.06.5-SNAPSHOT</version>
   </parent>
   <artifactId>mir-navigation-plugin</artifactId>
+  <version>2023.06-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>mir-navigation-plugin</name>
   <description>Navigation on series plugin for MyCoRe/MODS Institutional Repository</description>

From 68e62baf68bfba4560efc821bf3f0adbfaf4b628 Mon Sep 17 00:00:00 2001
From: Lennard Golsch <lennard.golsch@icloud.com>
Date: Wed, 11 Feb 2026 14:49:28 +0100
Subject: [PATCH 5/8] Improve README.md

---
 README.md | 124 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 94 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 8b7033c..40f901c 100644
--- a/README.md
+++ b/README.md
@@ -1,47 +1,111 @@
 # mir-navigation-plugin
 
-Includes an extended navigation for newspapers and series. It based on a widen solr handling for 
-parent documents (root field).
+This MIR plugin provides navigation functionality for newspapers and series.
 
-The plugin provides the extended solr handling for series (solr-navigation.xsl). In frontend
-context there is a series layout with a panel that shows the navigation. 
+It provides a panel for the frontend that displays the series navigation, including banner and search.
+The navigation is based on a derivate that contains a `navigation.xml` file, where the navigation structure and banner
+can be configured.
 
-## Installation instructions for mir lts 2023.06 (As mir-enduser)
+It leverages enhanced Solr handling for parent documents (root field) and includes extended Solr processing for series.
 
-1. Download the project from this repository and place it on your computer
+> ⚠️ Note: The plugin will overwrite `response-mir.xsl`; any custom frontend changes may be lost.
 
-2. Unzip the downloaded file to create a development project folder location 
+---
 
-3. Customize general mycore.properties(http://www.mycore.de/documentation/getting_started/mcr_properties.html) for this plugin (/mir-navigation-plugin/src/main/resources/config/mir-navigation-plugin/mycore.properties)
+## Features
 
-4. Create jar file with maven => mvn clean && mvn install
+The plugin offers the following features:
 
-5. Copy the created jar file from target (/mir-navigation-plugin/target) to mycore home lib 
+- Frontend Navigation Panel: Displays a series of pages or objects with banner and search.
+- Banner Support: Root item can include a banner image.
+- Flexible Navigation: Defined via navigation.xml with relative/absolute links and multilingual labels.
+- Enhanced Solr Handling: Supports parent documents (root field) and requires schema extensions.
+- Optional RSS Feed: RSS link can be displayed or disabled.
 
-(Windows Systems C:\Users\User\AppData\Local\MyCoRe\mirapplication\lib) <br />
-(Linux Systems /home/user/.mycore/mirapplication/lib)
+---
 
-6. The navigation plugin uses a widen solr handling for parent documents. For this purpose, the plugin brings its own schema extensions. It is necessary to reload the solr schema (for further information have a look on solr mycore documentation http://www.mycore.de/documentation/search/using_solr.html).
-In case of a standard solr core installation (the main core is named „main“) open the mir web cli:
+## Requirements
 
--	run command „reload solr configuration main in core main“
-	* This command synchronizes the solr main core with the solr schema from this plugin
--	Reload the mir core with solr webadmin (Core Admin - reload)
-	* You can do a quick check in the solr webadmin via mir schema menu item (root field should be there now)
--	Reindex solr with the rules from the navigation plugin with command „rebuild solr metadata and content index in core main“
-	* solr entries should provide the extended handling for parent documents now (root field)
+### Navigation category in `derivate_types` classification
 
-## Requirements for mods document metadata
-The standard implementation identifies derivates as series-navigation relatable if they have set categid="navigation" in derobject classification:
+The plugin is based on a derivate which must be classified via `derivate_types:navigation`.
+Therefore, the `derivate_types` classification must include a category `navigation`.
+The category can be defined as follows:
 
-      <derobject inherited="0" xlink:type="locator" xlink:href="mir_derivate_00000001">
-        <order>1</order>
-        <maindoc>index.xml</maindoc>
-        <classification classid="derivate_types" categid="navigation" />
-      </derobject>
+```xml
+<category ID="navigation">
+  <label xml:lang="de" text="Navigation" />
+  <label xml:lang="en" text="Navigation" />
+</category>
+```
 
+---
 
-## Migrate series navigation in mir
-For adding the series navigation panel in the right corner you have to adapt the MIR.Layout.End property (add series-banner,series-layout):
+## Installation & Configuration
 
-`MIR.Layout.End=mir-edit,series-banner,series-layout,mir-citation,mir-thumbnail,mir-epusta,mir-access-rights,mir-export,mir-admindata,mir-historydata`
\ No newline at end of file
+### Build and provide plugin
+
+Build the JAR file with `mvn clean install` and copy it to `~/.mycore/(dev-)mir/lib/`.
+
+### Configure `mycore.properties`
+
+To use the plugin, configuration in `~/.mycore/(dev-)mir/mycore.properties` is required.
+The RSS feed requires a `mycoreobject-rss` stylesheet, which is not included by default.
+For historical reasons, the link to the RSS feed is always displayed, but it can be disabled if needed.
+All in all, configure as follows:
+
+```text
+# Add 'series-banner' and 'series-layout'.
+MIR.Layout.End=mir-edit,series-banner,series-layout,mir-citation,mir-thumbnail,mir-epusta,mir-access-rights,mir-export,mir-admindata,mir-historydata
+
+# Optional: disable RSS feed.
+MIR.Metadata.Navigation.SeriesPanel.RSS.Enabled=false
+```
+
+### Reload and rebuild Solr
+
+The plugin leverages enhanced Solr handling for parent documents.
+For this purpose, the plugin brings its own schema extensions.
+It is necessary to reload the Solr schema (for further information have a look on Solr
+[documentation](https://www.mycore.de/documentation/search/search_solr_use/)).
+In the case of a standard Solr core installation (where the main core is named `main`), run the following CLI commands:
+
+```text
+# Synchronize the solr main core with the solr schema from this plugin.
+reload solr configuration main in core main
+# Reindex solr with the rules.
+rebuild solr metadata and content index in core main
+```
+
+As a result, Solr entries will now support the extended handling for parent documents (root field).
+
+---
+
+## Usage
+
+A panel on an object page, including a banner, navigation, and search, can be integrated via a `navigation.xml` file
+contained in a derivative whose _derivate type_ is set to _navigation_.
+The following format is expected for the `navigation.xml` file:
+
+```xml
+<item banner="path/to/banner.png">
+  <item ref="path/to/page1.xml">
+    <label xml:lang="de">German label for page 1</label>
+    <label xml:lang="en">English label for page 1</label>
+  </item>
+  <item ref="path/to/page2.xml">
+    <label xml:lang="de">German label for page 2</label>
+    <label xml:lang="en">English label for page 2</label>
+  </item>
+</item>
+```
+
+A root item is expected first. The optional `banner` attribute can be used to specify a link to an image that will be 
+displayed above the navigation.
+
+Within the root item, the actual navigation points can be defined. The `ref` attribute specifies the target of a 
+navigation point and can contain either a relative or an absolute link.  
+Additionally, labels can be defined for the relevant languages.
+
+> 💡 Tip: Using the [mir-alias-plugin](https://github.com/MyCoRe-Org/mir-alias-plugin), you can simplify the links
+> for objects in the navigation.

From 72a589bd6d12824dcc273358b242f1f4695df937 Mon Sep 17 00:00:00 2001
From: Lennard Golsch <lennard.golsch@icloud.com>
Date: Wed, 11 Feb 2026 13:31:05 +0100
Subject: [PATCH 6/8] Introduce property to toggle RSS feed in the series panel

---
 .../config/mir-navigation-plugin/mycore.properties       | 2 +-
 src/main/resources/xsl/series-panel.xsl                  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/config/mir-navigation-plugin/mycore.properties b/src/main/resources/config/mir-navigation-plugin/mycore.properties
index 296bd24..3e5dc33 100644
--- a/src/main/resources/config/mir-navigation-plugin/mycore.properties
+++ b/src/main/resources/config/mir-navigation-plugin/mycore.properties
@@ -11,7 +11,7 @@ MCR.URIResolver.xslImports.solr-document=%MCR.URIResolver.xslImports.solr-docume
 ######################################################################
 ##                  RSS Feed for journals and series                ##
 ######################################################################
-
+MIR.Metadata.Navigation.SeriesPanel.RSS.Enabled=true
 #MCR.LayoutTransformerFactory.Default.Ignore=mycoreobject-rss,%MCR.LayoutTransformerFactory.Default.Ignore%
 #DuEPublico.RSS.Generator=DuEPublico\: Duisburg-Essen Publications Online, University of Duisburg-Essen, Germany
 
diff --git a/src/main/resources/xsl/series-panel.xsl b/src/main/resources/xsl/series-panel.xsl
index 52fe3d6..a315572 100644
--- a/src/main/resources/xsl/series-panel.xsl
+++ b/src/main/resources/xsl/series-panel.xsl
@@ -12,6 +12,7 @@
   <xsl:param name="WebApplicationBaseURL" />
   <xsl:param name="CurrentLang" />
   <xsl:param name="ServletsBaseURL" />
+  <xsl:param name="MIR.Metadata.Navigation.SeriesPanel.RSS.Enabled" />
   
   <xsl:template match="mycoreobject" mode="seriesLayout">
     <xsl:apply-templates select="structure/derobjects/derobject[classification[@classid='derivate_types'][@categid='navigation']]/@xlink:href" mode="seriesLayout">
@@ -45,9 +46,11 @@
         <div class="card-body">
           <ul>
             <xsl:apply-templates select="item" mode="seriesLayout" />
-            <xsl:call-template name="rssLink">
-              <xsl:with-param name="rootID" select="$rootID" />
-            </xsl:call-template>
+            <xsl:if test="$MIR.Metadata.Navigation.SeriesPanel.RSS.Enabled='true'">
+              <xsl:call-template name="rssLink">
+                <xsl:with-param name="rootID" select="$rootID" />
+              </xsl:call-template>
+            </xsl:if>
           </ul>
         </div>
 

From 7f12820381500ef46cddb744513837c80149dc60 Mon Sep 17 00:00:00 2001
From: Lennard Golsch <lennard.golsch@icloud.com>
Date: Wed, 11 Feb 2026 11:52:44 +0100
Subject: [PATCH 7/8] Render banner only if present

---
 src/main/resources/xsl/series-panel.xsl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/xsl/series-panel.xsl b/src/main/resources/xsl/series-panel.xsl
index a315572..42aa5c3 100644
--- a/src/main/resources/xsl/series-panel.xsl
+++ b/src/main/resources/xsl/series-panel.xsl
@@ -31,10 +31,12 @@
     <xsl:param name="rootID" />
 
     <div id="series-layout">
-  
-      <a class="banner-link" href="{$WebApplicationBaseURL}receive/{$rootID}">
-        <img class="card-img-top" src="{$WebApplicationBaseURL}{@banner}" alt="Logo {../label[lang($CurrentLang)]}" />
-      </a>
+
+      <xsl:if test="normalize-space(@banner) != ''">
+        <a class="banner-link" href="{$WebApplicationBaseURL}receive/{$rootID}">
+          <img class="card-img-top" src="{$WebApplicationBaseURL}{@banner}" alt="Logo {../label[lang($CurrentLang)]}" />
+        </a>
+      </xsl:if>
 
       <div class="card series-card">
         <div class="card-header">

From ba79bcca883085eec1cd729b455ac4571e2e5efc Mon Sep 17 00:00:00 2001
From: Lennard Golsch <lennard.golsch@icloud.com>
Date: Wed, 11 Feb 2026 11:27:06 +0100
Subject: [PATCH 8/8] Update response-mir.xsl

---
 src/main/resources/xsl/response-mir.xsl | 544 +++++++++++++++---------
 1 file changed, 340 insertions(+), 204 deletions(-)

diff --git a/src/main/resources/xsl/response-mir.xsl b/src/main/resources/xsl/response-mir.xsl
index 16b68b5..d764762 100644
--- a/src/main/resources/xsl/response-mir.xsl
+++ b/src/main/resources/xsl/response-mir.xsl
@@ -13,6 +13,7 @@
   xmlns:decoder="xalan://java.net.URLDecoder"
   exclude-result-prefixes="i18n mods str exslt mcr acl mcrxsl basket encoder decoder">
 
+  <xsl:import href="xslImport:badges" />
   <xsl:include href="resource:xsl/csl-export-gui.xsl" />
   <xsl:include href="resource:xsl/response-facets.xsl"/>
   <xsl:include href="resource:xsl/response-mir-utils.xsl" />
@@ -21,6 +22,8 @@
   <xsl:param name="UserAgent" />
   <xsl:param name="MIR.testEnvironment" />
   <xsl:param name="MCR.ORCID.OAuth.ClientSecret" select="''" />
+  <xsl:param name="MIR.Solr.Secondary.Search.RequestHandler.List" select="'find'" />
+  <xsl:param name="RequestURL" />
 
   <xsl:variable name="maxScore" select="//result[@name='response'][1]/@maxScore" />
 
@@ -57,97 +60,318 @@
       </div>
     </div>
 
-<!-- Suchschlitz mit Suchbegriff, Treffer - Nummer, Vorschau, Autor, Änderungsdatum, Link zu den Details, Filter  -->
+    <!-- Suchschlitz mit Suchbegriff, Treffer - Nummer, Vorschau, Autor, Änderungsdatum, Link zu den Details, Filter  -->
     <div class="row result_searchline">
       <div class="col-12 col-sm-8 text-center result_search">
-        <div class="search_box">
-          <xsl:variable name="searchlink" select="concat($proxyBaseURL, $HttpSession, $solrParams)" />
-          <form action="{$searchlink}" class="search_form" method="post">
-            <div class="input-group input-group-sm">
-              <div class="input-group-btn input-group-prepend">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" value="all" id="search_type_button">
-                  <span id="search_type_label">
-                    <xsl:value-of select="i18n:translate('mir.dropdown.all')" />
-                  </span>
-                  <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu search_type">
-                  <li>
-                    <a href="#" value="all" class="dropdown-item">
-                      <xsl:value-of select="i18n:translate('mir.dropdown.all')" />
-                    </a>
-                  </li>
-                  <li>
-                    <a href="#" value="mods.title" class="dropdown-item">
-                      <xsl:value-of select="i18n:translate('mir.dropdown.title')" />
-                    </a>
-                  </li>
-                  <li>
-                    <a href="#" value="mods.author" class="dropdown-item">
-                      <xsl:value-of select="i18n:translate('mir.dropdown.author')" />
-                    </a>
-                  </li>
-                  <li>
-                    <a href="#" value="mods.name.top" class="dropdown-item">
-                      <xsl:value-of select="i18n:translate('mir.dropdown.name')" />
-                    </a>
-                  </li>
-                  <li>
-                    <a href="#" value="mods.nameIdentifier" class="dropdown-item">
-                      <xsl:value-of select="i18n:translate('mir.dropdown.nameIdentifier')" />
-                    </a>
-                  </li>
-                  <li>
-                    <a href="#" value="allMeta" class="dropdown-item">
-                      <xsl:value-of select="i18n:translate('mir.dropdown.allMeta')" />
-                    </a>
-                  </li>
-                  <li>
-                    <a href="#" value="content" class="dropdown-item">
-                      <xsl:value-of select="i18n:translate('mir.dropdown.content')" />
-                    </a>
-                  </li>
-                </ul>
-              </div>
-              <xsl:variable name="resolver">
-                <xsl:call-template name="substring-after-last">
-                  <xsl:with-param name="string" select="$proxyBaseURL" />
-                  <xsl:with-param name="delimiter" select="'/'" />
-                </xsl:call-template>
-              </xsl:variable>
+
+        <!-- check which SOLR RequestHandler is used, if the value is from the list of the -->
+        <!-- $MIR.Solr.Secondary.Search.RequestHandler.List, then it shows the form with secondary search -->
+        <xsl:variable name="isSolrSearchRequest">
+          <xsl:for-each select="str:tokenize($MIR.Solr.Secondary.Search.RequestHandler.List, ',')">
+            <xsl:variable name="handlerPattern" select="concat('/servlets/solr/', .)"/>
+            <xsl:if test="contains($RequestURL, $handlerPattern)">
+              <xsl:variable name="afterHandler" select="substring-after($RequestURL, $handlerPattern)"/>
+              <xsl:if test="
+                $afterHandler = '' or
+                starts-with($afterHandler, '?') or
+                starts-with($afterHandler, '&amp;')">
+                <xsl:text>true</xsl:text>
+              </xsl:if>
+            </xsl:if>
+          </xsl:for-each>
+        </xsl:variable>
+
+        <xsl:if test="normalize-space($isSolrSearchRequest) = 'true'">
+
+          <div class="search_box">
+
+            <!-- Check if 'condQuery' exists and extract its value if it does -->
+            <xsl:variable name="condQuery" select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='condQuery']" />
+
+            <!-- Check if 'initialCondQuery' exists and extract its value if it does -->
+            <xsl:variable name="initialCondQuery" select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='initialCondQuery']" />
+
+            <!-- Check if 'fq' exists and extract its value if it does -->
+            <xsl:variable name="fq">
               <xsl:choose>
-                <xsl:when test="$resolver = 'find'">
-                  <xsl:variable name="qry">
-                    <xsl:variable name="encodedQry">
-                      <xsl:call-template name="UrlGetParam">
-                        <xsl:with-param name="url" select="$RequestURL" />
-                        <xsl:with-param name="par" select="'condQuery'" />
-                      </xsl:call-template>
-                    </xsl:variable>
-                    <xsl:value-of select="decoder:decode($encodedQry, 'UTF-8')" />
-                  </xsl:variable>
+                <!-- Case 1: fq is an array -->
+                <xsl:when test="/response/lst[@name='responseHeader']/lst[@name='params']/arr[@name='fq']">
+                  <xsl:value-of select="/response/lst[@name='responseHeader']/lst[@name='params']/arr[@name='fq']/str[
+                starts-with(., 'mods.title:') or
+                starts-with(., 'mods.author:') or
+                starts-with(., 'mods.name.top:') or
+                starts-with(., 'mods.nameIdentifier:') or
+                starts-with(., 'allMeta:')
+            ][1]" />
+                </xsl:when>
+
+                <!-- Case 2: fq is a single string -->
+                <xsl:when test="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq']">
+                  <xsl:if test="starts-with(/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq'], 'mods.title:') or
+                          starts-with(/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq'], 'mods.author:') or
+                          starts-with(/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq'], 'mods.name.top:') or
+                          starts-with(/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq'], 'mods.nameIdentifier:') or
+                          starts-with(/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq'], 'allMeta:')">
+                    <xsl:value-of select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq']" />
+                  </xsl:if>
+                </xsl:when>
+
+                <!-- Default: No valid fq parameter found -->
+                <xsl:otherwise>
+                  <xsl:text />
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+
+            <!-- Check if 'owner' exists and extract its value if it does -->
+            <xsl:variable name="owner" select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='owner']" />
+
+            <!-- Check if 'version' exists and extract its value if it does -->
+            <xsl:variable name="version" select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='version']" />
+
+            <!-- Extract part before ':' ('%3A') if $fq is not empty or null -->
+            <xsl:variable name="initialSelectMods">
+              <xsl:choose>
+                <xsl:when test="$fq and normalize-space($fq) != ''">
+                  <!-- xsl:value-of select="substring-before($fq, '%3A')" / -->
+                  <xsl:value-of select="substring-before($fq, ':')" />
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="'all'" />
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+
+            <!-- Extract part after ':' ('%3A') if $fq is not empty or null -->
+            <xsl:variable name="filterQueryValue">
+              <xsl:choose>
+                <xsl:when test="$fq">
+                  <xsl:value-of select="substring-after($fq, ':')" />
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="''" />
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+
+            <!-- Variable for the 'action' attribute in the form element (without query parameters) -->
+            <xsl:variable name="searchlink" select="concat($proxyBaseURL, $HttpSession)" />
+
+            <!-- Form for the second search -->
+            <form action="{$searchlink}" class="search_form" method="post">
+              <xsl:choose>
+                <xsl:when test="not($fq)">
+                  <input type="hidden" id="fq" name="fq" value=""/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <input type="hidden" id="fq" name="fq" value="{$fq}"/>
+                </xsl:otherwise>
+              </xsl:choose>
+
+              <!-- Hidden elements with request parameters -->
+              <input type="hidden" id="initialCondQuerySecond" name="initialCondQuery" value="{$initialCondQuery}"/>
+              <input type="hidden" id="owner" name="owner" value="{$owner}"/>
+              <input type="hidden" id="version" name="version" value="{$version}"/>
+
+              <div class="input-group input-group-sm">
+
+                <!-- Dropdown for the filter query (select mods) -->
+                <div class="input-group-btn input-group-prepend">
+                  <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" value="{$initialSelectMods}" id="select_mods">
+                    <span id="select_mods_label">
+                      <xsl:choose>
+                        <xsl:when test="$initialSelectMods = 'mods.title'">
+                          <xsl:value-of select="i18n:translate('mir.dropdown.title')" />
+                        </xsl:when>
+                        <xsl:when test="$initialSelectMods = 'mods.author'">
+                          <xsl:value-of select="i18n:translate('mir.dropdown.author')" />
+                        </xsl:when>
+                        <xsl:when test="$initialSelectMods = 'mods.name.top'">
+                          <xsl:value-of select="i18n:translate('mir.dropdown.name')" />
+                        </xsl:when>
+                        <xsl:when test="$initialSelectMods = 'mods.nameIdentifier'">
+                          <xsl:value-of select="i18n:translate('mir.dropdown.nameIdentifier')" />
+                        </xsl:when>
+                        <xsl:when test="$initialSelectMods = 'allMeta'">
+                          <xsl:value-of select="i18n:translate('mir.dropdown.allMeta')" />
+                        </xsl:when>
+                        <xsl:when test="$initialSelectMods = 'content'">
+                          <xsl:value-of select="i18n:translate('mir.dropdown.content')" />
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:value-of select="i18n:translate('mir.dropdown.all')" />
+                        </xsl:otherwise>
+                      </xsl:choose>
+
+                    </span>
+                    <span class="caret"></span>
+                  </button>
+                  <ul class="dropdown-menu select_mods_type">
+                    <li>
+                      <a href="#" value="all" class="dropdown-item">
+                        <xsl:value-of select="i18n:translate('mir.dropdown.all')" />
+                      </a>
+                    </li>
+                    <li>
+                      <a href="#" value="mods.title" class="dropdown-item">
+                        <xsl:value-of select="i18n:translate('mir.dropdown.title')" />
+                      </a>
+                    </li>
+                    <li>
+                      <a href="#" value="mods.author" class="dropdown-item">
+                        <xsl:value-of select="i18n:translate('mir.dropdown.author')" />
+                      </a>
+                    </li>
+                    <li>
+                      <a href="#" value="mods.name.top" class="dropdown-item">
+                        <xsl:value-of select="i18n:translate('mir.dropdown.name')" />
+                      </a>
+                    </li>
+                    <li>
+                      <a href="#" value="mods.nameIdentifier" class="dropdown-item">
+                        <xsl:value-of select="i18n:translate('mir.dropdown.nameIdentifier')" />
+                      </a>
+                    </li>
+                    <li>
+                      <a href="#" value="allMeta" class="dropdown-item">
+                        <xsl:value-of select="i18n:translate('mir.dropdown.allMeta')" />
+                      </a>
+                    </li>
+                    <li>
+                      <a href="#" value="content" class="dropdown-item">
+                        <xsl:value-of select="i18n:translate('mir.dropdown.content')" />
+                      </a>
+                    </li>
+                  </ul>
+                </div>
+
+                <xsl:variable name="resolver">
+                  <xsl:call-template name="substring-after-last">
+                    <xsl:with-param name="string" select="$proxyBaseURL" />
+                    <xsl:with-param name="delimiter" select="'/'" />
+                  </xsl:call-template>
+                </xsl:variable>
+
+                <xsl:variable name="query">
                   <xsl:choose>
-                    <xsl:when test="$qry = '*'">
-                      <input class="form-control" name="qry" placeholder="{i18n:translate('mir.placeholder.response.search')}" type="text" />
+                    <xsl:when test="$condQuery">
+                      <xsl:choose>
+                        <xsl:when test="$condQuery = $initialCondQuery">
+                          <xsl:value-of select="''" />
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:variable name="searchString" select="concat($initialCondQuery, ' AND ')" />
+                          <xsl:value-of select="substring-after($condQuery, $searchString)" />
+                        </xsl:otherwise>
+                      </xsl:choose>
                     </xsl:when>
                     <xsl:otherwise>
-                      <input class="form-control" name="qry" placeholder="{i18n:translate('mir.placeholder.response.search')}" type="text" value="{$qry}" />
+                      <xsl:value-of select="''" />
                     </xsl:otherwise>
                   </xsl:choose>
-                </xsl:when>
-                <xsl:otherwise>
-                  <input class="form-control" name="condQuery" placeholder="{i18n:translate('mir.placeholder.response.search')}" type="text" />
-                </xsl:otherwise>
-              </xsl:choose>
-              <span class="input-group-btn input-group-append">
-                <button class="btn btn-primary" type="submit">
-                  <span class="fas fa-search"></span>
-                   <xsl:value-of select="i18n:translate('editor.search.search')"/>
-                </button>
-              </span>
-            </div>
-          </form>
-        </div>
+                </xsl:variable>
+
+                <!-- Get a current qry from the last request value -->
+                <xsl:variable name="currentQryFromLastRequest">
+                  <xsl:choose>
+                    <xsl:when test="not($filterQueryValue) or $filterQueryValue = ''">
+                      <xsl:value-of select="$query" />
+                    </xsl:when>
+                    <xsl:when test="$filterQueryValue = '*'">
+                      <!-- If filterQueryValue is '*', leave value empty -->
+                      <xsl:value-of select="''" />
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:value-of select="$filterQueryValue" />
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:variable>
+
+                <!-- Decode the current query -->
+                <xsl:variable name="decodedCurrentQryFromLastRequest"
+                  select="decoder:decode($currentQryFromLastRequest, 'UTF-8')" />
+
+                <!-- Get a type of the last request -->
+                <xsl:variable name="lastTypeRequest">
+                  <xsl:choose>
+                    <xsl:when test="not($filterQueryValue) or $filterQueryValue = ''">
+                      <xsl:choose>
+                        <xsl:when test="$condQuery = $initialCondQuery">
+                          <xsl:value-of select="''" />
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:value-of select="'condQuery'" />
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:value-of select="'fq'" />
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:variable>
+
+                <!-- Hidden query parameter 'condQuery' or 'q' based on $resolver -->
+                <input type="hidden" id="condQuery">
+                  <!-- Conditionally set the 'name' attribute based on the value of $resolver -->
+                  <xsl:attribute name="name">
+                    <xsl:choose>
+                      <!-- If $resolver is 'find', use 'condQuery' -->
+                      <xsl:when test="$resolver = 'find'">
+                        <xsl:value-of select="'condQuery'" />
+                      </xsl:when>
+                      <!-- Otherwise, use 'q' -->
+                      <xsl:otherwise>
+                        <xsl:value-of select="'q'" />
+                      </xsl:otherwise>
+                    </xsl:choose>
+                  </xsl:attribute>
+
+                  <!-- Set the 'value' attribute based on conditions -->
+                  <xsl:attribute name="value">
+                    <xsl:choose>
+                      <!-- If $lastTypeRequest is 'condQuery' -->
+                      <xsl:when test="$lastTypeRequest = 'condQuery'">
+                        <xsl:choose>
+                          <!-- If $initialCondQuery is '*' or empty -->
+                          <xsl:when test="$initialCondQuery = '*' or $initialCondQuery = ''">
+                            <xsl:value-of select="'*'" />
+                          </xsl:when>
+                          <!-- Otherwise, concatenate $initialCondQuery, ' AND ' and $decodedCurrentQryFromLastRequest -->
+                          <xsl:otherwise>
+                            <xsl:value-of select="concat($initialCondQuery, ' AND ', $decodedCurrentQryFromLastRequest)" />
+                          </xsl:otherwise>
+                        </xsl:choose>
+                      </xsl:when>
+                      <!-- If $lastTypeRequest is 'fq' or empty, use $initialCondQuery -->
+                      <xsl:when test="$lastTypeRequest = 'fq' or $lastTypeRequest = ''">
+                        <xsl:value-of select="$initialCondQuery" />
+                      </xsl:when>
+                      <!-- Default case, use $initialCondQuery -->
+                      <xsl:otherwise>
+                        <xsl:value-of select="$initialCondQuery" />
+                      </xsl:otherwise>
+                    </xsl:choose>
+                  </xsl:attribute>
+                </input>
+
+                <!-- Preparing the current query for the input field (remove all quotes) -->
+                <xsl:variable name="preparedCurrentQryFromLastRequest"
+                  select="translate($decodedCurrentQryFromLastRequest, '&quot;', '')" />
+                <!-- Input element for the second search -->
+                <input class="form-control" id="qry" placeholder="{i18n:translate('mir.placeholder.response.search')}"
+                  type="text" value="{$preparedCurrentQryFromLastRequest}" />
+
+                <span class="input-group-btn input-group-append">
+                  <button class="btn btn-primary" type="submit">
+                    <span class="fas fa-search"></span>
+                    <xsl:value-of select="i18n:translate('editor.search.search')"/>
+                  </button>
+                </span>
+              </div>
+            </form>
+          </div>
+
+        </xsl:if>
       </div>
 
       <!-- START: alle zu basket -->
@@ -204,7 +428,7 @@
       </div>
     </xsl:if -->
 
-<!-- Filter, Pagination & Trefferliste -->
+    <!-- Filter, Pagination & Trefferliste -->
     <div class="row result_body">
 
       <div class="col-12 col-sm-8 result_list">
@@ -231,11 +455,11 @@
             </xsl:if>
           </div>
         </div>
-        
+
         <!-- series layout panel: show if query includes "root" condition (query limited to objects "below" root ID) -->
         <xsl:for-each select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='q'][starts-with(.,'root:')]">
-          <xsl:variable name="rootID" select="substring-after(.,'root:')" />
-          <xsl:apply-templates select="document(concat('notnull:mcrobject:',$rootID))/mycoreobject" mode="seriesLayout" />
+          <xsl:variable name="root-id" select="substring-after(.,'root:')" />
+          <xsl:apply-templates select="document(concat('notnull:mcrobject:',$root-id))/mycoreobject" mode="seriesLayout" />
         </xsl:for-each>
 
         <!-- Dynamic facets -->
@@ -346,7 +570,7 @@
             <xsl:value-of select="$hitCount" />
           </div>
 
-<!-- relevance -->
+          <!-- relevance -->
           <xsl:variable name="score" select="float[@name='score']" />
           <xsl:if test="$score &gt; 0 and $maxScore &gt; 0">
             <xsl:variable name="relevance" select="($score div $maxScore) * 100" />
@@ -369,7 +593,7 @@
             </div>
           </xsl:if>
 
-<!-- hit options -->
+          <!-- hit options -->
           <xsl:choose>
             <xsl:when test="acl:checkPermission($identifier,'writedb')">
               <div class="hit_options float-right">
@@ -386,7 +610,7 @@
                         <xsl:with-param name="dropdown" select="'true'" />
                       </xsl:call-template>
                     </li>
-                        <!-- direct link to editor -->
+                    <!-- direct link to editor -->
                     <xsl:if test="acl:checkPermission($identifier,'writedb')">
                       <li>
                         <xsl:variable name="editURL">
@@ -399,15 +623,15 @@
                           <xsl:choose>
                             <xsl:when test="string-length($editURL) &gt; 0">
                               <xsl:attribute name="href">
-                                    <xsl:value-of select="$editURL" />
-                                  </xsl:attribute>
+                                <xsl:value-of select="$editURL" />
+                              </xsl:attribute>
                               <span class="fas fa-pencil-alt"></span>
                               <xsl:value-of select="i18n:translate('object.editObject')" />
                             </xsl:when>
                             <xsl:otherwise>
                               <xsl:attribute name="href">
-                                    <xsl:value-of select="'#'" />
-                                  </xsl:attribute>
+                                <xsl:value-of select="'#'" />
+                              </xsl:attribute>
                               <span class="fas fa-pencil-alt"></span>
                               <xsl:value-of select="i18n:translate('object.locked')" />
                             </xsl:otherwise>
@@ -434,11 +658,11 @@
       </div><!-- end row head -->
 
 
-<!-- hit body -->
+      <!-- hit body -->
       <div class="row hit_item_body">
         <div class="col-12">
 
-<!-- document preview -->
+          <!-- document preview -->
           <div class="hit_download_box">
             <xsl:variable name="viewerLink">
               <xsl:choose>
@@ -492,7 +716,7 @@
               <xsl:choose>
                 <!-- when the thumbnail derivate has pdf as maindoc or a iviewFile, then use the iiif api -->
                 <xsl:when
-                        test="$displayDerivate/str[@name='iviewFile'] or translate(str:tokenize($displayDerivate/str[@name='derivateMaindoc'],'.')[position()=last()],'PDF','pdf') = 'pdf'">
+                  test="$displayDerivate/str[@name='iviewFile'] or translate(str:tokenize($displayDerivate/str[@name='derivateMaindoc'],'.')[position()=last()],'PDF','pdf') = 'pdf'">
                   <div class="hit_icon">
                     <xsl:choose>
                       <xsl:when test="not(mcrxsl:isCurrentUserGuestUser())">
@@ -504,7 +728,7 @@
                         <xsl:attribute name="style">
                           <xsl:variable name="apos">'</xsl:variable>
                           <xsl:value-of
-                                  select="concat('background-image: url(', $apos, $WebApplicationBaseURL, 'api/iiif/image/v2/thumbnail/', $identifier, '/full/!300,300/0/default.jpg',$apos,')')"/>
+                            select="concat('background-image: url(', $apos, $WebApplicationBaseURL, 'api/iiif/image/v2/thumbnail/', $identifier, '/full/!300,300/0/default.jpg',$apos,')')"/>
                         </xsl:attribute>
                       </xsl:otherwise>
                     </xsl:choose>
@@ -516,10 +740,10 @@
                 </xsl:when>
                 <xsl:otherwise>
                   <div class="hit_icon"
-                       style="background-image: url('{$WebApplicationBaseURL}images/icons/icon_common.png');"/>
+                    style="background-image: url('{$WebApplicationBaseURL}images/icons/icon_common.png');"/>
                   <!-- if not, then the content type decides a icon -->
                   <xsl:variable name="contentType"
-                                select="document(concat('ifs:/',$derivid))/mcr_directory/children/child[name=$maindoc]/contentType"/>
+                    select="document(concat('ifs:/',$derivid))/mcr_directory/children/child[name=$maindoc]/contentType"/>
                   <xsl:variable name="iconLink">
                     <xsl:call-template name="iconLink">
                       <xsl:with-param name="baseURL" select="$WebApplicationBaseURL"/>
@@ -545,113 +769,25 @@
 
           </div>
 
-<!-- hit type -->
+          <!-- hit type -->
           <div class="hit_tnd_container">
             <div class="hit_tnd_content">
-              <div class="hit_oa" data-toggle="tooltip">
-                <xsl:variable name="isOpenAccess" select="bool[@name='worldReadableComplete']='true'" />
-                <xsl:choose>
-                  <xsl:when test="$isOpenAccess">
-                    <xsl:attribute name="title">
-                      <xsl:value-of select="i18n:translate('mir.response.openAccess.true')" />
-                    </xsl:attribute>
-                    <span class="badge badge-success">
-                      <i class="fas fa-unlock-alt" aria-hidden="true"></i>
-                    </span>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:attribute name="title">
-                      <xsl:value-of select="i18n:translate('mir.response.openAccess.false')" />
-                    </xsl:attribute>
-                    <span class="badge badge-warning">
-                      <i class="fas fa-lock" aria-hidden="true"></i>
-                    </span>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </div>
-              <xsl:choose>
-                <xsl:when test="arr[@name='mods.genre']">
-                  <xsl:for-each select="arr[@name='mods.genre']/str">
-                    <div class="hit_type">
-                      <span class="badge badge-info">
-                        <xsl:value-of select="mcrxsl:getDisplayName('mir_genres',.)" ></xsl:value-of>
-                      </span>
-                    </div>
-                  </xsl:for-each>
-                </xsl:when>
-                <xsl:otherwise>
-                  <div class="hit_type">
-                    <span class="badge badge-info">
-                      <xsl:value-of select="mcrxsl:getDisplayName('mir_genres','article')" />
-                    </span>
-                  </div>
-                </xsl:otherwise>
-              </xsl:choose>
-              <xsl:if test="arr[@name='category.top']/str[contains(text(), 'mir_licenses:')]">
-                <div class="hit_license">
-                  <span class="badge badge-primary">
-                    <xsl:variable name="accessCondition">
-                      <xsl:value-of select="substring-after(arr[@name='category.top']/str[contains(text(), 'mir_licenses:')][last()],':')" />
-                    </xsl:variable>
-                    <xsl:choose>
-                      <xsl:when test="contains($accessCondition, 'rights_reserved')">
-                        <xsl:value-of select="i18n:translate('component.mods.metaData.dictionary.rightsReserved')" />
-                      </xsl:when>
-                      <xsl:when test="contains($accessCondition, 'oa_nlz')">
-                        <xsl:value-of select="i18n:translate('component.mods.metaData.dictionary.oa_nlz.short')" />
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:value-of select="mcrxsl:getDisplayName('mir_licenses',$accessCondition)" />
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </span>
-                </div>
-              </xsl:if>
-              <xsl:if test="str[@name='mods.dateIssued'] or str[@name='mods.dateIssued.host']">
-                <div class="hit_date">
-                  <xsl:variable name="date">
-                    <xsl:choose>
-                      <xsl:when test="str[@name='mods.dateIssued']">
-                        <xsl:value-of select="str[@name='mods.dateIssued']" />
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:value-of select="str[@name='mods.dateIssued.host']" />
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:variable>
-                  <span class="badge badge-primary">
-                    <xsl:value-of select="$date" />
-                  </span>
-                </div>
-              </xsl:if>
-              <xsl:if test="not (mcrxsl:isCurrentUserGuestUser())">
-                <div class="hit_state">
-                  <xsl:variable name="status-i18n">
-                    <!-- template in mir-utils.xsl -->
-                    <xsl:call-template name="get-doc-state-label">
-                      <xsl:with-param name="state-categ-id" select="str[@name='state']"/>
-                    </xsl:call-template>
-                  </xsl:variable>
-                  <span class="badge mir-{str[@name='state']}" title="{i18n:translate('component.mods.metaData.dictionary.status')}">
-                    <xsl:value-of select="$status-i18n" />
-                  </span>
-                </div>
-              </xsl:if>
+              <xsl:apply-imports/>
               <xsl:if test="string-length($MCR.ORCID.OAuth.ClientSecret) &gt; 0">
                 <div class="orcid-status" data-id="{$identifier}" />
               </xsl:if>
             </div>
           </div>
 
-<!-- hit headline -->
+          <!-- hit headline -->
           <h3 class="hit_title">
             <a href="{$hitHref}">
               <xsl:attribute name="title">
-                    <xsl:value-of select="./str[@name='mods.title.main']" />
-                    <xsl:if test="./str[@name='mods.title.subtitle']">
-                      <xsl:value-of select="concat(' : ', ./str[@name='mods.title.subtitle'])" />
-                    </xsl:if>
-                  </xsl:attribute>
+                <xsl:value-of select="./str[@name='mods.title.main']" />
+                <xsl:if test="./str[@name='mods.title.subtitle']">
+                  <xsl:value-of select="concat(' : ', ./str[@name='mods.title.subtitle'])" />
+                </xsl:if>
+              </xsl:attribute>
               <xsl:choose>
                 <xsl:when test="./str[@name='search_result_link_text']">
                   <xsl:value-of select="./str[@name='search_result_link_text']" />
@@ -666,7 +802,7 @@
             </a>
           </h3>
 
-<!-- hit author -->
+          <!-- hit author -->
           <xsl:if
             test="arr[@name='mods.nameByRole.personal.aut'] or arr[@name='mods.nameByRole.personal.edt'] or arr[@name='mods.nameByRole.corporate.pbl'] or arr[@name='mods.nameByRole.corporate.edt']"
           >
@@ -737,7 +873,7 @@
             </div>
           </xsl:if>
 
-<!-- hit parent -->
+          <!-- hit parent -->
           <xsl:if test="./str[@name='parent']">
             <div class="hit_source">
               <span class="label_parent">aus: </span>
@@ -757,7 +893,7 @@
             </div>
           </xsl:if>
 
-<!-- hit abstract -->
+          <!-- hit abstract -->
           <xsl:variable name="description">
             <xsl:choose>
               <xsl:when test="arr[@name=concat('mods.abstract.result.', $CurrentLang)]/str">
@@ -774,7 +910,7 @@
             </div>
           </xsl:if>
 
-<!-- hit publisher -->
+          <!-- hit publisher -->
           <xsl:if test="arr[@name='mods.publisher']">
             <div class="hit_pub_name">
               <xsl:variable name="date">
@@ -825,7 +961,7 @@
     <xsl:variable name="searchString">
       <xsl:variable name="queryPrefix" select="'{!join from=returnId to=id}+content:'" />
       <xsl:variable name="fullTextQuery"
-                    select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq' and contains(., $queryPrefix)]" />
+        select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq' and contains(., $queryPrefix)]" />
       <xsl:choose>
         <xsl:when test="$fullTextQuery">
           <xsl:value-of select="substring-after($fullTextQuery, $queryPrefix)" />
@@ -850,7 +986,7 @@
     <xsl:param name="collection" select="''" />
     <xsl:choose>
       <xsl:when test="mcrxsl:resourceAvailable('actionmappings.xml')">
-      <!-- URL mapping enabled -->
+        <!-- URL mapping enabled -->
         <xsl:variable name="url">
           <xsl:choose>
             <xsl:when test="string-length($collection) &gt; 0">
@@ -892,7 +1028,7 @@
         </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
-      <!-- URL mapping disabled -->
+        <!-- URL mapping disabled -->
         <xsl:choose>
           <xsl:when test="$layout != '$'">
             <xsl:value-of select="concat($WebApplicationBaseURL,'/editor/editor-dynamic.xed',$HttpSession,'?id=',$id,'&amp;genre=article&amp;host=standalone')" />
@@ -1083,7 +1219,7 @@
         <!-- remove from basket -->
         <a
           class="hit_option remove_from_basket {$dropdownclass}"
-          href="{$ServletsBaseURL}MCRBasketServlet{$HttpSession}?type=objects&amp;action=remove&amp;id={$identifier}&amp;redirect=referer"
+          href="{$ServletsBaseURL}MCRBasketServlet{$HttpSession}?type=objects&amp;action=remove&amp;id={$identifier}&Samp;redirect=referer"
           title="" >
           <span class="fas fa-bookmark"></span>&#160;
           <xsl:value-of select="i18n:translate('basket.remove')" />