diff --git a/local/languages/de.ini b/local/languages/de.ini
index 66aabed317ceb5a2952d75fead8d45b5b1a81a64..a666e2a1f8fbe23c85136aec9f4d54d8b35a74c0 100644
--- a/local/languages/de.ini
+++ b/local/languages/de.ini
@@ -1964,4 +1964,9 @@ Visual Media = "Bildmaterial"
 ReliefPrint = Druckgraphik
 
 ; Accessibility
-Modal_description = "Sie befinden sich in einem Dialogfenster, das über dem Hauptinhalt der Seiten liegt. Drücken Sie die Escape-Taste oder die Schaltfläche 'Dialogfenster schließen', um das Fenster zu schließen und auf der Hauptseite weiterzuarbeiten."
\ No newline at end of file
+Modal_description = "Sie befinden sich in einem Dialogfenster, das über dem Hauptinhalt der Seiten liegt. Drücken Sie die Escape-Taste oder die Schaltfläche 'Dialogfenster schließen', um das Fenster zu schließen und auf der Hauptseite weiterzuarbeiten."
+
+; #17598
+Skip to search = "Weiter zum Suchbereich"
+; Overwrite, only in de.ini necessary:
+Search type = "Suchtyp"
diff --git a/local/languages/en.ini b/local/languages/en.ini
index 4fc8d4deae608ea0c8dc6b0cfdf0949d782cd394..b1e8dc69e1f4a25dea864498ef3ec0fd2d9cfd58 100644
--- a/local/languages/en.ini
+++ b/local/languages/en.ini
@@ -2063,4 +2063,7 @@ Digital Collection = "Digital Collection"
 ReliefPrint = "Printmaking"
 
 ; Accessibility
-Modal_description = "This is a dialog window which overlays the main content of the page. Pressing the Escape key or the Close Dialog Window button will close the modal and bring you back to where you were on the page."
\ No newline at end of file
+Modal_description = "This is a dialog window which overlays the main content of the page. Pressing the Escape key or the Close Dialog Window button will close the modal and bring you back to where you were on the page."
+
+; #17598
+Skip to search = "Skip to search"
diff --git a/module/fid/src/View/Helper/Root/RecordDataFormatterFactory.php b/module/fid/src/View/Helper/Root/RecordDataFormatterFactory.php
index 185a746ac8c3583c87bea894c1e135f0e253564f..4de990d6e76925db998b6a784796869f9c2c6e01 100644
--- a/module/fid/src/View/Helper/Root/RecordDataFormatterFactory.php
+++ b/module/fid/src/View/Helper/Root/RecordDataFormatterFactory.php
@@ -26,10 +26,11 @@
  */
 namespace fid\View\Helper\Root;
 
+use finc\View\Helper\Root\RecordDataFormatterFactory as FincRecordDataFormatterFactory;
 use VuFind\View\Helper\Root\RecordDataFormatter;
 use VuFind\View\Helper\Root\RecordDataFormatter\SpecBuilder;
 
-class RecordDataFormatterFactory
+class RecordDataFormatterFactory extends FincRecordDataFormatterFactory
 {
     /**
      * Create the helper.
@@ -38,7 +39,7 @@ class RecordDataFormatterFactory
      */
     public function __invoke()
     {
-        $helper = new RecordDataFormatter();
+        $helper = parent::__invoke();
 
         $helper->setDefaults('fid-acquisition-general', [$this, 'getFidAcquisitionSpecs']);
         $helper->setDefaults('fid-acquisition-subito-partial-copy', [$this, 'getFidAcquisitionSubitoPartialCopySpecs']);
@@ -54,7 +55,7 @@ class RecordDataFormatterFactory
     public function getFidAcquisitionSpecBuilder()
     {
         $spec = new SpecBuilder();
-        $spec->setLine('Title','getTitle');
+        $spec->setLine('Title', 'getTitle');
         $spec->setTemplateLine(
             'Authors/Corporations',
             'getDeduplicatedAuthors',
@@ -78,7 +79,7 @@ class RecordDataFormatterFactory
             'getPrice',
             'data-price.phtml'
         );
-        $spec->setLine('Language','getLanguages');
+        $spec->setLine('Language', 'getLanguages');
         return $spec;
     }
 
@@ -101,7 +102,7 @@ class RecordDataFormatterFactory
     public function getFidAcquisitionSubitoPartialCopySpecs()
     {
         $spec = $this->getFidAcquisitionSpecBuilder();
-        $spec->setLine('fid::number_of_pages','getNumberOfPages');
+        $spec->setLine('fid::number_of_pages', 'getNumberOfPages');
         return $spec->getArray();
     }
 }
diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index 88c052b84055f827ac8503b43cdca3a50f333218..061f09768dbeb602648a353305e5818e23ab209a 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -1226,6 +1226,12 @@ header,
   float: left;
   padding: ($grid-gutter-width / 4) ($grid-gutter-width / 2) ($grid-gutter-width / 4) 0;
 
+  img {
+    &:hover {
+      @include outline(1px);
+    }
+  }
+
   @media (max-width: $screen-xs-max) {
     height: auto;
   }
@@ -1893,16 +1899,6 @@ footer {
   }
 }
 
-#advSearchForm {
-  // Remove dotted lines around items when hovering over
-  .close {
-    &:hover,
-    &:focus {
-      outline: none;
-    }
-  }
-}
-
 ////// Swap find and clear buttons for consistency
 .adv-submit {
   .fnd-btn {
@@ -2171,6 +2167,10 @@ footer ul {
   span {
     font-size: small;
   }
+
+  a:hover {
+    @include outline(1px);
+  }
 }
 
 // FOOTER - END
diff --git a/themes/finc/templates/Recommend/SideFacets/single-facet.phtml b/themes/finc/templates/Recommend/SideFacets/single-facet.phtml
index ea0a7b9fd968b9dc657c3d00f5c1f8180f4d602a..58b71027afa3d45a1526d6942dabac89ac2457af 100644
--- a/themes/finc/templates/Recommend/SideFacets/single-facet.phtml
+++ b/themes/finc/templates/Recommend/SideFacets/single-facet.phtml
@@ -51,7 +51,7 @@
 
   <?php if ($this->exclude && !$this->facet['isApplied']): ?>
     <?php $excludeURL = $this->urlBase . $this->url->addFacet($this->group, $this->facet['value'], 'NOT'); ?>
-    <a href="<?=$excludeURL ?>" data-lightbox-ignore title="<?=$this->transEsc('exclude_facet') ?>" class="exclude"><i class="fa fa-times" aria-hidden="true"></i><span class="sr-only"><?=$this->transEsc('exclude_facet') ?></span> </a>
+    <a href="<?=$excludeURL ?>" data-lightbox-ignore class="exclude"><i class="fa fa-times" aria-hidden="true"></i><span class="sr-only"><?=$this->transEsc('exclude_facet') ?></span> </a>
   <?php endif; ?>
 
 <?=$hasSubLinks ? '</div>' : '</a>'; ?>