diff --git a/module/VuFind/src/VuFind/Controller/CollectionController.php b/module/VuFind/src/VuFind/Controller/CollectionController.php
index eff46209f5e8c9c9b1348260689389b38585f83c..3702a00db10292225f0a73f1c2fd0a7622d8cfa9 100644
--- a/module/VuFind/src/VuFind/Controller/CollectionController.php
+++ b/module/VuFind/src/VuFind/Controller/CollectionController.php
@@ -64,8 +64,10 @@ class CollectionController extends AbstractRecord
         return array(
             'VuFind\RecordDriver\AbstractBase'
                 => array(
-                    'CollectionList' => 'CollectionList',
-                    'HierarchyTree' => 'CollectionHierarchyTree',
+                    'tabs' => array(
+                        'CollectionList' => 'CollectionList',
+                        'HierarchyTree' => 'CollectionHierarchyTree',
+                    )
                 )
         );
     }
diff --git a/module/VuFind/src/VuFind/Search/SolrCollection/Options.php b/module/VuFind/src/VuFind/Search/SolrCollection/Options.php
index c0cd39b2e4267beffef1990995dd56ec3e3288b6..fcce78c3f87a7f9a772c1d327a5f5f39d3f343c4 100644
--- a/module/VuFind/src/VuFind/Search/SolrCollection/Options.php
+++ b/module/VuFind/src/VuFind/Search/SolrCollection/Options.php
@@ -39,18 +39,16 @@ namespace VuFind\Search\SolrCollection;
 class Options extends \VuFind\Search\Solr\Options
 {
     /**
-     * Perform initialization that cannot occur in constructor due to need for
-     * injected dependencies.
+     * Constructor
      *
-     * @return void
+     * @param \VuFind\Config\PluginManager $configLoader Config loader
      */
-    public function init()
+    public function __construct(\VuFind\Config\PluginManager $configLoader)
     {
-        parent::init();
+        parent::__construct($configLoader);
 
         // Load sort preferences (or defaults if none in .ini file):
-        $searchSettings = $this->getServiceLocator()->get('VuFind\Config')
-            ->get('Collection');
+        $searchSettings = $configLoader->get('Collection');
         if (isset($searchSettings->Sort)) {
             $this->sortOptions = array();
             foreach ($searchSettings->Sort as $key => $value) {