diff --git a/facetapi.js b/facetapi.js
index a22dfec..f4c584a 100644
--- a/facetapi.js
+++ b/facetapi.js
@@ -2,18 +2,22 @@
 
 Drupal.behaviors.facetapi = {
   attach: function(context, settings) {
-    // Iterates over facet settings, applies functionality like the "Sore more"
+    // Iterates over facet settings, applies functionality like the "Show more"
     // links for block realm facets.
     // @todo We need some sort of JS API so we don't have to make decisions
     // based on the realm.
     for (var index in settings.facetapi.facets) {
       if ('block' == settings.facetapi.facets[index].realmName) {
-        // Find all checkbox facet links and give them a checkbox.
-        $('a.facetapi-checkbox.facetapi-inactive', context).each(Drupal.facetapi.addCheckbox);
-        // Find all unclick links and turn them into checkboxes.
-        $('a.facetapi-checkbox.facetapi-active', context).each(Drupal.facetapi.makeCheckbox);
-        // Applies soft limit to the list.
-        Drupal.facetapi.applyLimit(settings.facetapi.facets[index]);
+        if (null != settings.facetapi.facets[index].makeCheckboxes) {
+          // Find all checkbox facet links and give them a checkbox.
+          $('a.facetapi-checkbox.facetapi-inactive', context).each(Drupal.facetapi.addCheckbox);
+          // Find all unclick links and turn them into checkboxes.
+          $('a.facetapi-checkbox.facetapi-active', context).each(Drupal.facetapi.makeCheckbox);
+        }
+        if (null != settings.facetapi.facets[index].limit) {
+          // Applies soft limit to the list.
+          Drupal.facetapi.applyLimit(settings.facetapi.facets[index]);
+        }
       }
     }
   }
diff --git a/plugins/facetapi/widget.inc b/plugins/facetapi/widget.inc
index e9cae02..77b150d 100644
--- a/plugins/facetapi/widget.inc
+++ b/plugins/facetapi/widget.inc
@@ -114,7 +114,6 @@ abstract class FacetapiWidget {
     $this->jsSettings += array(
       'id' => $this->build['#attributes']['id'],
       'searcher' => $searcher,
-      'type' => $this->facet->getAdapter()->getType(),
       'realmName' => $this->realm['name'],
       'facetName' => $this->facet['name'],
       'queryType' => $this->facet['query type'],
diff --git a/plugins/facetapi/widget_checkbox_links.inc b/plugins/facetapi/widget_checkbox_links.inc
index 2bd1590..cff5184 100644
--- a/plugins/facetapi/widget_checkbox_links.inc
+++ b/plugins/facetapi/widget_checkbox_links.inc
@@ -11,6 +11,15 @@
 class FacetapiWidgetCheckboxLinks extends FacetapiWidgetLinks {
 
   /**
+   * JavaScript settings.
+   *
+   * @var array
+   */
+  protected $jsSettings = array(
+    'makeCheckboxes' => 1,
+  );
+
+  /**
    * Sets the base class for checkbox facet items.
    *
    * @return array
diff --git a/plugins/facetapi/widget_links.inc b/plugins/facetapi/widget_links.inc
index ce21f00..33cc986 100644
--- a/plugins/facetapi/widget_links.inc
+++ b/plugins/facetapi/widget_links.inc
@@ -22,15 +22,8 @@ class FacetapiWidgetLinks extends FacetapiWidget {
    */
   public function __construct($id, array $realm, FacetapiFacet $facet, stdClass $settings) {
     parent::__construct($id, $realm, $facet, $settings);
-    $this->key = $facet['name'];
-  }
-
-  /**
-   * Adds JS settings.
-   */
-  public function init() {
     $this->jsSettings['limit'] = $this->settings->settings['soft_limit'];
-    return parent::init();
+    $this->key = $facet['name'];
   }
 
   /**