diff --git a/apachesolr_autocomplete.info b/apachesolr_autocomplete.info
index 4287880..86943ed 100755
--- a/apachesolr_autocomplete.info
+++ b/apachesolr_autocomplete.info
@@ -4,3 +4,10 @@ dependencies[] = apachesolr
 dependencies[] = apachesolr_search
 package = "Apache Solr"
 core = "7.x"
+
+; Information added by drupal.org packaging script on 2011-03-21
+version = "7.x-1.x-dev"
+core = "7.x"
+project = "apachesolr_autocomplete"
+datestamp = "1300708901"
+
diff --git a/apachesolr_autocomplete.module b/apachesolr_autocomplete.module
index d85c30d..eb38e23 100755
--- a/apachesolr_autocomplete.module
+++ b/apachesolr_autocomplete.module
@@ -269,7 +269,6 @@ function apachesolr_autocomplete_suggest_additional_term($keys, $suggestions_to_
       }
     }
   }
-
   return $suggestions;
 }
 
@@ -287,25 +286,12 @@ function apachesolr_autocomplete_suggest($keys, $params, $theme_callback, $orig_
   // Query Solr for $keys so that suggestions will always return results.
   $query = apachesolr_drupal_query($keys);
 
-  // Allow other modules to modify query.
-  apachesolr_modify_query($query,'apachesolr_autocomplete');
-  if (!$query) {
-    return array();
+  foreach($params as $param => $paramValue) {
+    $query->addParam($param, $paramValue);
   }
-  apachesolr_search_add_spellcheck_params($query);
-  $params += $query->params;
 
-  // Try to contact Solr.
-  try {
-    $solr = apachesolr_get_solr();
-  }
-  catch (Exception $e) {
-    watchdog('apachesolr_autocomplete', $e->getMessage(), NULL, WATCHDOG_ERROR);
-    return array();
-  }
-
-  // Query Solr
-  $response = $solr->search($keys, $params['start'], $params['rows'], $params);
+  // Use the base apachesolr module's function to do the query to allow other modules to modify query.
+  list($final_query, $response) = apachesolr_do_query($query);
   foreach ($params['facet.field'] as $field) {
     foreach ($response->facet_counts->facet_fields->{$field} as $terms => $count) {
       $terms = preg_replace('/[_-]+/', ' ', $terms);
@@ -322,6 +308,7 @@ function apachesolr_autocomplete_suggest($keys, $params, $theme_callback, $orig_
     }
   }
 
+
   if (sizeof($matches) > 0) {
     // Eliminate suggestions that are stopwords or are already in the query.
     $matches_clone = $matches;