diff --git a/fid_bbi/config/vufind/facets.ini b/fid_bbi/config/vufind/facets.ini
index 989e8a4da80738edd994e404d89ce30a4eeb283a..0bf4e6d32acd0fae4693aeffede8179962137f38 100644
--- a/fid_bbi/config/vufind/facets.ini
+++ b/fid_bbi/config/vufind/facets.ini
@@ -43,6 +43,7 @@ orFacets = language,finc_class_facet,mega_collection,format_finc
 collapsedFacets = language,finc_class_facet,author_facet,mega_collection, format_finc
 ;sorted_by_index[] =
 
+
 [Author]
 topic_facet = "Related Subjects"
 
@@ -50,7 +51,6 @@ topic_facet = "Related Subjects"
 ; use a single facet here
 ; see #14759
 mega_collection    = Datensammlung
-source_id          = Quelle
 
 [Advanced]
 format_finc	       = Medientyp
@@ -58,13 +58,13 @@ mega_collection    = Datensammlung
 facet_avail        = Facet::Availability
 
 [Advanced_Settings]
-facet_limit      = 100
+facet_limit      = -1
 special_facets   = "daterange"
 translated_facets[] = language
 translated_facets[] = access_facet
 translated_facets[] = finc_class_facet
 translated_facets[] = rvk_facet
-translated_facets[] = mega_collection
+translated_facets[] = mega_collection:Facet
 translated_facets[] = format_finc
 translated_facets[] = language
 translated_facets[] = facet_avail:Facet
@@ -105,11 +105,10 @@ mega_collection[] = "DeGruyter SSH"
 mega_collection[] = "Wolfenbütteler Bibliographie zur Geschichte des Buchwesens"
 ;"LISSA - LIS Scholarship Archive"
 mega_collection[] = "LISSA"
-;mega_collection[] = "British National Bibliography"
-;mega_collection[] = "British Library Catalogue"
 mega_collection[] = "VD17"
 mega_collection[] = "VD18"
-mega_collection[] = "Datenbank Buch und Papier"
+;mega_collection[] = "Datenbank Buch und Papier"
+mega_collection[] = "Datenbank \"Buch und Papier\""
 mega_collection[] = "HPB - Heritage of the Printed Book Database"
 mega_collection[] = "DABI"
 mega_collection[] = "English Short Title Catalogue (ESTC)"
@@ -118,23 +117,29 @@ mega_collection[] = "Catalogue of Illuminated Manuscripts"
 mega_collection[] = "BBB (Bibliographie der Buch- und Bibliotheksgeschichte)"
 mega_collection[] = "Digitised Manuscripts"
 mega_collection[] = "Database of Bookbindings"
-mega_collection[] = "GoeScholar"
+;mega_collection[] = "GoeScholar"
 ;Buchhandschriften der UB Leipzig
-source_id[] = 159
+;source_id[] = 159
+mega_collection[] = "Digitale Sammlungen UBL"
 ;Wolfenbütteler Bibliographie zur Geschichte des Buchwesens
 ;source_id[] = 173
 
 ; #16726
 ;BASE
-source_id[] = 126
+;source_id[] = 126
+mega_collection[] = "BASE - Bielefeld Academic Search Engine"
 ;British National Bibliography
-source_id[] = 180
+;source_id[] = 180
+mega_collection[] = "British National Bibliography"
 ;British Library Catalogue
-source_id[] = 181
+;source_id[] = 181
+mega_collection[] = "British Library Catalogue"
 ;K10plus
-source_id[] = 183
+;source_id[] = 183
+mega_collection[] = "K10plus Verbundkatalog"
 ;GoeScholar - Publikationenserver der Georg-August-Universität Göttingen
-source_id[] = 188
+;source_id[] = 188
+mega_collection[] = "GoeScholar - Publikationenserver der Georg-August-Universität Göttingen"
 
 ; #16064
 mega_collection[] = "MOnAMi Hochschulschriftenserver Mittweida"
diff --git a/fid_bbi/languages/Facet/de.ini b/fid_bbi/languages/Facet/de.ini
index 91c32e7b06ec530b1f8cc7a3bbf3af0a45e57fd0..0ba133369760bc9e30c12e9a5cb87cc2fdbf1ac3 100644
--- a/fid_bbi/languages/Facet/de.ini
+++ b/fid_bbi/languages/Facet/de.ini
@@ -33,3 +33,5 @@ Non-Free     = Beschränkter Zugang
 181 = "British Library Catalogue"
 183 = "K10plus"
 188 = "GoeScholar - Publikationenserver der Georg-August-Universität Göttingen"
+
+Digitale Sammlungen UBL = "Buchhandschriften der UB Leipzig"
\ No newline at end of file
diff --git a/fid_bbi/languages/Facet/en.ini b/fid_bbi/languages/Facet/en.ini
index 8435ae83ac317c22209ff6f12dc6f3f8333a2fe1..a7b098d774d69968e465ccc0adaa44743ff410de 100644
--- a/fid_bbi/languages/Facet/en.ini
+++ b/fid_bbi/languages/Facet/en.ini
@@ -31,4 +31,6 @@ Non-Free     = Restricted Access
 180 = "British National Bibliography"
 181 = "British Library Catalogue"
 183 = "K10plus"
-188 = "GoeScholar - Publikationenserver der Georg-August-Universität Göttingen"
\ No newline at end of file
+188 = "GoeScholar - Publikationenserver der Georg-August-Universität Göttingen"
+
+Digitale Sammlungen UBL = "Buchhandschriften der UB Leipzig"
\ No newline at end of file
diff --git a/module/fid_bbi/src/fid_bbi/Controller/SearchController.php b/module/fid_bbi/src/fid_bbi/Controller/SearchController.php
index a51f27153d162ffdd999a2674958a34468765ba9..72a575f887fdd69a3748e9d764ddb4dd6991088d 100644
--- a/module/fid_bbi/src/fid_bbi/Controller/SearchController.php
+++ b/module/fid_bbi/src/fid_bbi/Controller/SearchController.php
@@ -51,10 +51,12 @@ class SearchController extends BaseSearchController
     {
         $homepageFacets = $this->getConfig('facets')->HomePage->toArray();
 
-        $results = $this->getResultsManager()->get($this->searchClassId);
-        $facets = $results->getPartialFieldFacets(
-            array_keys($homepageFacets), true, -1, 'name'
-        );
+        $facetCache = $this->serviceLocator
+            ->get('VuFind\Search\FacetCache\PluginManager')
+            ->get($this->searchClassId);
+
+        $facets = $facetCache->getList('Advanced');
+        $results = $facetCache->getResults();
 
         $renderer = $this->getViewRenderer();
 
@@ -67,7 +69,7 @@ class SearchController extends BaseSearchController
                     $results,
                     $facet,
                     $this->filterFacets(
-                        $facets[$facet]['data']['list'],
+                        $facets[$facet]['list'],
                         $facet
                     ),
                     'search-results'