Index: Solr_Base_Query.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Solr_Base_Query.php,v
retrieving revision 1.1.4.40
diff -u -p -r1.1.4.40 Solr_Base_Query.php
--- Solr_Base_Query.php   2 Jul 2009 08:50:46 -0000   1.1.4.40
+++ Solr_Base_Query.php   7 Jul 2009 19:21:22 -0000
@@ -137,6 +137,10 @@ class Solr_Base_Query implements Drupal_
     $this->id = ++self::$idCount;
   }
 
+  public function remove_keys() {
+    unset($this->keys);
+  }
+
   public function add_filter($field, $value, $exclude = FALSE) {
     $this->fields[] = array('#exclude' => $exclude, '#name' => $field, '#value' => trim($value));
   }
Index: apachesolr_search.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr_search.module,v
retrieving revision 1.1.2.6.2.111
diff -u -p -r1.1.2.6.2.111 apachesolr_search.module
--- apachesolr_search.module   2 Jul 2009 21:58:34 -0000   1.1.2.6.2.111
+++ apachesolr_search.module   7 Jul 2009 19:19:52 -0000
@@ -619,7 +619,12 @@ function apachesolr_search_block($op = '
             if (!$fields) {
               $options['attributes']['class'] = 'active';
             }
-            $links[] = apachesolr_l($query->get_query_basic(), $path, $options);
+            // If current search has keys, offer current search without them
+            if ($keys = $query->get_query_basic()) {
+              $new_query = clone $query;
+              $new_query->remove_keys();
+              $links[] = theme('apachesolr_unclick_link', $keys, $new_query->get_path(), array('query' => $new_query->get_url_queryvalues()));
+            }
             foreach($fields as $field) {
               if ($field['#name']) {
                 $new_query = clone $query;