--- apachesolr.module	2008-05-29 12:28:38.703749000 -0500
+++ apachesolr.module	2008-05-29 12:18:23.061994000 -0500
@@ -324,7 +324,6 @@ function apachesolr_block($op = 'list', 
         // Get the query and response. Without these no blocks make sense.
         $query =& apachesolr_drupal_query();
         $response =& apachesolr_static_response_cache();
-        $facet_link_query = (is_array($_GET['gids'])) ? 'gids[]=' . implode(',', $_GET["gids"]) : NULL;
         if (empty($response)) {
           return;
         }
@@ -374,7 +373,7 @@ function apachesolr_block($op = 'list', 
                   $contains_active = TRUE;
                   $new_query->remove_field('tid', $term->tid);
                   $path = 'search/'. arg(1). '/'. $new_query->get_query();
-                  $unclick_link = theme('apachesolr_unclick_link', $path, $facet_link_query);
+                  $unclick_link = theme('apachesolr_unclick_link', $path);
                 }
                 else {
                   $new_query->add_field('tid', $term->tid);
@@ -386,7 +385,7 @@ function apachesolr_block($op = 'list', 
                   // skip
                 }
                 else {
-                  $terms[$term->vid][$active ? $countsort. $term->name : 1 + $countsort. $term->name] = theme('apachesolr_facet_item', $term->name, $count, $path, $active, $unclick_link, $facet_link_query);
+                  $terms[$term->vid][$active ? $countsort. $term->name : 1 + $countsort. $term->name] = theme('apachesolr_facet_item', $term->name, $count, $path, $active, $unclick_link);
                 }
               }
             }
@@ -416,7 +415,7 @@ function apachesolr_block($op = 'list', 
                   $contains_active = TRUE;
                   $new_query->remove_field('type', $t);
                   $path = 'search/'. arg(1). '/'. $new_query->get_query();
-                  $unclick_link = theme('apachesolr_unclick_link', $path, $facet_link_query);
+                  $unclick_link = theme('apachesolr_unclick_link', $path);
                 }
                 else {
                   $new_query->add_field('type', $t);
@@ -428,7 +427,7 @@ function apachesolr_block($op = 'list', 
                   // skip
                 }
                 else {
-                  $types[$active ? $countsort. $type : 1 + $countsort. $type] = theme('apachesolr_facet_item', $facet, $count, $path, $active, $unclick_link, $facet_link_query);
+                  $types[$active ? $countsort. $type : 1 + $countsort. $type] = theme('apachesolr_facet_item', $type, $count, $path, $active, $unclick_link);
                 }
               }
               if (is_array($types)) {
@@ -450,7 +449,7 @@ function apachesolr_block($op = 'list', 
                   $contains_active = TRUE;
                   $new_query->remove_field('uid', $uid);
                   $path = 'search/'. arg(1). '/'. $new_query->get_query();
-                  $unclick_link = theme('apachesolr_unclick_link', $path, $facet_link_query);
+                  $unclick_link = theme('apachesolr_unclick_link', $path);
                 }
                 else {
                   $new_query->add_field('uid', $uid);
@@ -462,7 +461,7 @@ function apachesolr_block($op = 'list', 
                   // skip
                 }
                 else {
-                  $users[$active ? $countsort. name : 1 + $countsort. $name] = theme('apachesolr_facet_item', $name, $count, $path, $active, $unclick_link, $facet_link_query);
+                  $users[$active ? $countsort. name : 1 + $countsort. $name] = theme('apachesolr_facet_item', $name, $count, $path, $active, $unclick_link);
                 }
               }
               if (is_array($users)) {
@@ -488,7 +487,7 @@ function apachesolr_block($op = 'list', 
                       $contains_active = TRUE;
                       $new_query->remove_field($index_key, $facet);
                       $path = 'search/'. arg(1). '/'. $new_query->get_query();
-                      $unclick_link = theme('apachesolr_unclick_link', $path, $facet_link_query);
+                      $unclick_link = theme('apachesolr_unclick_link', $path);
                     }
                     else {
                       $new_query->add_field($index_key, $facet);
@@ -500,7 +499,7 @@ function apachesolr_block($op = 'list', 
                       // skip
                     }
                     else {
-                      $facets[$active ? $countsort. $facet : 1 + $countsort. $facet] = theme('apachesolr_facet_item', $facet, $count, $path, $active, $unclick_link, $facet_link_query);
+                      $facets[$active ? $countsort. $facet : 1 + $countsort. $facet] = theme('apachesolr_facet_item', $facet, $count, $path, $active, $unclick_link);
                     }
                   }
                   if (is_array($facets)) {
@@ -696,7 +695,7 @@ function apachesolr_simpletest() {
   return array_keys($tests);
 }
 
-function theme_apachesolr_facet_item($name, $count, $path, $active = FALSE, $unclick_link = NULL, $query = NULL) {
+function theme_apachesolr_facet_item($name, $count, $path, $active = FALSE, $unclick_link = NULL) {
   $attributes = array();
   if ($active) {
     $attributes['class'] = 'active';
@@ -705,12 +704,12 @@ function theme_apachesolr_facet_item($na
     return $unclick_link . " $name";
   }
   else {
-    return l($name. " ($count)",  $path, $attributes, $query);
+    return l($name. " ($count)",  $path, $attributes);
   }
 }
 
-function theme_apachesolr_unclick_link($path, $query = NULL) {
-  return l("(-)", $path, NULL, $query);
+function theme_apachesolr_unclick_link($path) {
+  return l("(-)", $path);
 }
 
 function theme_apachesolr_sort_link($text, $path, $query, $direction = NULL) {