diff --git a/Solr_Base_Query.php b/Solr_Base_Query.php
index 9826b15..8451527 100644
--- a/Solr_Base_Query.php
+++ b/Solr_Base_Query.php
@@ -283,8 +283,9 @@ class SolrBaseQuery extends SolrFilterSubQuery implements DrupalSolrQueryInterfa
   public $page = 0;
 
   /**
-   * @param $env_id
-   *   The environment where you are calling the query from.  Typically the default environment.
+   * @param $name
+   *   The search name, used for finding the correct blocks and other config.
+   *   Typically "apachesolr".
    *
    * @param $solr
    *   An instantiated DrupalApacheSolrService Object.
diff --git a/apachesolr_search.module b/apachesolr_search.module
index 292cf8b..062f1c0 100644
--- a/apachesolr_search.module
+++ b/apachesolr_search.module
@@ -906,7 +906,7 @@ function apachesolr_search_conditions_default($search_page) {
   }
 
   // We may also have filters added by facet API module. The 'f'
-  // is determined by constant FacetapiAdapter::FILTER_KEY. Hard
+  // is determined by variable FacetapiUrlProcessor::$filterKey. Hard
   // coded here to avoid extra class loading.
   if (!empty($_GET['f']) && is_array($_GET['f'])) {
     if (module_exists('facetapi')) {
diff --git a/apachesolr_search.pages.inc b/apachesolr_search.pages.inc
index f462e08..3d6d22c 100644
--- a/apachesolr_search.pages.inc
+++ b/apachesolr_search.pages.inc
@@ -104,6 +104,8 @@ function apachesolr_search_custom_page_search_form_submit(&$form, &$form_state)
   if (strlen($form_state['values']['keys'])) {
     $redirect .= '/' . $redirect_value;
   }
+
+  $get = array();
   if (isset($form_state['values']['get'])) {
     $get = json_decode($form_state['values']['get'], TRUE);
   }
@@ -112,8 +114,15 @@ function apachesolr_search_custom_page_search_form_submit(&$form, &$form_state)
     $get['retain-filters'] = '1';
   }
   else {
-    $get = array();
+    // Remove all filters
+    if (!empty($search_page['settings']['apachesolr_search_allow_user_input'])) {
+      unset($get['fq']);
+    }
+    if (module_exists('facetapi')) {
+      unset($get['f']);
+    }
   }
+
   // Add the query values into the redirect.
   $form_state['redirect'] = array($redirect, array('query' => $get));
 }