diff --git a/contrib/current_search/plugins/current_search/item_text.inc b/contrib/current_search/plugins/current_search/item_text.inc
index a0eae4f..c7fc7f5 100644
--- a/contrib/current_search/plugins/current_search/item_text.inc
+++ b/contrib/current_search/plugins/current_search/item_text.inc
@@ -14,7 +14,7 @@ class CurrentSearchItemText extends CurrentSearchItem {
    * Implements CurrentSearchItem::execute().
    */
   public function execute(FacetapiAdapter $adapter) {
-    $data = array('facetapi_adapter' => $adapter);
+    $data = array('facetapi_results' => array('facetapi_adapter' => $adapter));
 
     // Determines plurality of string.
     if ($this->settings['plural']) {
diff --git a/facetapi.tokens.inc b/facetapi.tokens.inc
index 5462466..0ef7b66 100644
--- a/facetapi.tokens.inc
+++ b/facetapi.tokens.inc
@@ -124,9 +124,9 @@ function facetapi_token_info() {
 function facetapi_tokens($type, $tokens, array $data = array(), array $options = array()) {
   $replacements = array();
 
-  if ('facetapi_results' == $type && !empty($data['facetapi_adapter'])) {
+  if ('facetapi_results' == $type && !empty($data['facetapi_results']['facetapi_adapter'])) {
 
-    $adapter = $data['facetapi_adapter'];
+    $adapter = $data['facetapi_results']['facetapi_adapter'];
     foreach ($tokens as $name => $original) {
       switch ($name) {