diff --git a/facetapi.theme.inc b/facetapi.theme.inc
index 47f90f8..36889ae 100644
--- a/facetapi.theme.inc
+++ b/facetapi.theme.inc
@@ -32,7 +32,7 @@ function theme_facetapi_title($variables) {
 }
 
 /**
- * Returns HTML for an active facet item.
+ * Returns HTML for an inactive facet item.
  *
  * @param $variables
  *   An associative array containing the keys 'text', 'path', 'options', and
@@ -42,6 +42,10 @@ function theme_facetapi_title($variables) {
  * @ingroup themeable
  */
 function theme_facetapi_link_inactive($variables) {
+  if (isset($variables[''])) {
+    $variables = $variables[''];
+  }
+
   // Builds accessible markup.
   // @see http://drupal.org/node/1316580
   $accessible_vars = array(
@@ -80,7 +84,7 @@ function theme_facetapi_count($variables) {
 }
 
 /**
- * Returns HTML for an inactive facet item.
+ * Returns HTML for an active facet item.
  *
  * @param $variables
  *   An associative array containing the keys 'text', 'path', and 'options'. See
@@ -89,6 +93,9 @@ function theme_facetapi_count($variables) {
  * @ingroup themeable
  */
 function theme_facetapi_link_active($variables) {
+  if (isset($variables[''])) {
+    $variables = $variables[''];
+  }
 
   // Sanitizes the link text if necessary.
   $sanitize = empty($variables['options']['html']);
diff --git a/plugins/facetapi/widget_links.inc b/plugins/facetapi/widget_links.inc
index f15c7f4..466f818 100644
--- a/plugins/facetapi/widget_links.inc
+++ b/plugins/facetapi/widget_links.inc
@@ -84,9 +84,11 @@ class FacetapiWidgetLinks extends FacetapiWidget {
 
       // Initializes variables passed to theme hook.
       $variables = array(
+        '#theme' => $item['#theme'],
         'text' => $item['#markup'],
         'path' => $item['#path'],
         'count' => $item['#count'],
+        'indexed_value' => $item['#indexed_value'],
         'options' => array(
           'attributes' => $attributes,
           'html' => $item['#html'],
@@ -120,7 +122,7 @@ class FacetapiWidgetLinks extends FacetapiWidget {
       $variables['options']['attributes']['class'][] = $class;
 
       // Themes the link, adds row to items.
-      $row['data'] = theme($item['#theme'], $variables);
+      $row['data'] = $variables;
       $items[] = $row;
     }