diff --git a/module/VuFind/src/VuFind/Search/Favorites/Params.php b/module/VuFind/src/VuFind/Search/Favorites/Params.php
index 1b0a7eb26b5ee8a62508f27d685281fa283366bb..d7548db7ab0c711b1178fa4ff850143ea8661b26 100644
--- a/module/VuFind/src/VuFind/Search/Favorites/Params.php
+++ b/module/VuFind/src/VuFind/Search/Favorites/Params.php
@@ -26,7 +26,6 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\Favorites;
-use VuFind\Search\Base\Params as BaseParams;
 
 /**
  * Search Favorites Parameters
@@ -37,8 +36,13 @@ use VuFind\Search\Base\Params as BaseParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Params extends BaseParams
+class Params extends \VuFind\Search\Base\Params
 {
+    /**
+     * Auth manager
+     *
+     * @var \VuFind\Auth\Manager
+     */
     protected $account;
 
     /**
diff --git a/module/VuFind/src/VuFind/Search/MixedList/Params.php b/module/VuFind/src/VuFind/Search/MixedList/Params.php
index 3bcd546011e89234c68831bdccfeaabb73a180c7..900456bf6006c60e826d823fa7a74f71f69b7d06 100644
--- a/module/VuFind/src/VuFind/Search/MixedList/Params.php
+++ b/module/VuFind/src/VuFind/Search/MixedList/Params.php
@@ -26,7 +26,6 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\MixedList;
-use VuFind\Search\Base\Params as BaseParams;
 
 /**
  * Search Mixed List Parameters
@@ -37,10 +36,12 @@ use VuFind\Search\Base\Params as BaseParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Params extends BaseParams
+class Params extends \VuFind\Search\Base\Params
 {
     /**
      * Array of target record ids
+     *
+     * @var array
      */
     protected $recordsToRequest;
 
diff --git a/module/VuFind/src/VuFind/Search/Solr/Params.php b/module/VuFind/src/VuFind/Search/Solr/Params.php
index 3c38ddfd341a4ea426970323c7d0bf39082f93f5..bc939d534ac172a299fccbae24b39d819ed61f88 100644
--- a/module/VuFind/src/VuFind/Search/Solr/Params.php
+++ b/module/VuFind/src/VuFind/Search/Solr/Params.php
@@ -40,18 +40,29 @@ class Params extends \VuFind\Search\Base\Params
 {
     /**
      * Facet result limit
+     *
+     * @var int
      */
     protected $facetLimit = 30;
+
     /**
      * Offset for facet results
+     *
+     * @var int
      */
     protected $facetOffset = null;
+
     /**
      * Prefix for facet searching
+     *
+     * @var string
      */
     protected $facetPrefix = null;
+
     /**
      * Sorting order for facet search results
+     *
+     * @var string
      */
     protected $facetSort = null;
 
diff --git a/module/VuFind/src/VuFind/Search/SolrAuth/Params.php b/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
index d8cf08c0ed8fafea00fc81330ef50f48c533c29e..064801adf343cf2080291974847377049508675c 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
@@ -26,7 +26,6 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrAuth;
-use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * Solr Authority Search Parameters
@@ -37,6 +36,6 @@ use VuFind\Search\Solr\Params as SolrParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Params extends SolrParams
+class Params extends \VuFind\Search\Solr\Params
 {
 }
\ No newline at end of file
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php b/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
index f84e5806f997b1cf79e77be1854b3a2c2648d455..e819103a962cad74ee89adcb3d2c6a1aebbaab7c 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
@@ -26,7 +26,6 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthor;
-use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * Author Search Options
@@ -37,7 +36,7 @@ use VuFind\Search\Solr\Params as SolrParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Params extends SolrParams
+class Params extends \VuFind\Search\Solr\Params
 {
     /**
      * Support method for _initSearch() -- handle basic settings.
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
index 36ee5927f820889279509d396d94ae45435cdfcc..97c116a0430781688e10de8a2daa9cf21d032866 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
@@ -26,7 +26,6 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\SolrAuthorFacets;
-use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * AuthorFacets Search Parameters
@@ -37,7 +36,7 @@ use VuFind\Search\Solr\Params as SolrParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Params extends SolrParams
+class Params extends \VuFind\Search\Solr\Params
 {
     /**
      * Set parameters based on a search object
diff --git a/module/VuFind/src/VuFind/Search/SolrReserves/Params.php b/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
index d05ff81c4eb3379504541b7ca5d309fc82060019..9575d93243d6ea6f8740f6ab935a8a293412f1c8 100644
--- a/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
@@ -27,7 +27,6 @@
  * @link     http://www.vufind.org  Main Page
  */
 namespace VuFind\Search\SolrReserves;
-use VuFind\Search\Solr\Params as SolrParams;
 
 /**
  * Solr Reserves Search Parameters
@@ -39,6 +38,6 @@ use VuFind\Search\Solr\Params as SolrParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class Params extends SolrParams
+class Params extends \VuFind\Search\Solr\Params
 {
 }
\ No newline at end of file
diff --git a/module/VuFind/src/VuFind/Search/Summon/Params.php b/module/VuFind/src/VuFind/Search/Summon/Params.php
index 6520d4815a6081139b32341ca878a54f024bc21e..22cb37fc219350f1d2d5b692205c63c4a3fd9fc2 100644
--- a/module/VuFind/src/VuFind/Search/Summon/Params.php
+++ b/module/VuFind/src/VuFind/Search/Summon/Params.php
@@ -40,10 +40,15 @@ class Params extends \VuFind\Search\Base\Params
 {
     /**
      * Settings for all the facets
+     *
+     * @var array
      */
     protected $fullFacetSettings = array();
+
     /**
      * Settings for the date facet only
+     *
+     * @var array
      */
     protected $dateFacetSettings = array();
 
diff --git a/module/VuFind/src/VuFind/Search/Tags/Params.php b/module/VuFind/src/VuFind/Search/Tags/Params.php
index 272e10ab378e989862729585ebac6827e62105e8..be52762991e59a255b272cbd1c1ebb6e866ad1dc 100644
--- a/module/VuFind/src/VuFind/Search/Tags/Params.php
+++ b/module/VuFind/src/VuFind/Search/Tags/Params.php
@@ -26,7 +26,6 @@
  * @link     http://vufind.org   Main Site
  */
 namespace VuFind\Search\Tags;
-use VuFind\Search\Base\Params as BaseParams;
 
 /**
  * Search Tags Parameters
@@ -37,7 +36,7 @@ use VuFind\Search\Base\Params as BaseParams;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org   Main Site
  */
-class Params extends BaseParams
+class Params extends \VuFind\Search\Base\Params
 {
     /**
      * Load all recommendation settings from the relevant ini file.  Returns an