diff --git a/facetapi.theme.inc b/facetapi.theme.inc
index 5cf331f..32d119e 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,9 @@ function theme_facetapi_title($variables) {
  * @ingroup themeable
  */
 function theme_facetapi_link_inactive($variables) {
+  if (isset($variables[''])) {
+    $variables = $variables[''];
+  }
   if (isset($variables['count'])) {
     $variables['text'] .= ' ' . theme('facetapi_count', $variables);
   }
@@ -62,7 +65,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
@@ -71,6 +74,9 @@ function theme_facetapi_count($variables) {
  * @ingroup themeable
  */
 function theme_facetapi_link_active($variables) {
+  if (isset($variables[''])) {
+    $variables = $variables[''];
+  }
   $suffix = '';
   if (isset($variables['text'])) {
     if (empty($variables['options']['html'])) {
diff --git a/plugins/facetapi/widget_links.inc b/plugins/facetapi/widget_links.inc
index 7a1af23..e0f7a70 100644
--- a/plugins/facetapi/widget_links.inc
+++ b/plugins/facetapi/widget_links.inc
@@ -77,9 +77,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' => array('class' => $this->getItemClasses()),
           'html' => $item['#html'],
@@ -108,7 +110,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;
     }