diff --git a/facetapi.js b/facetapi.js
index f4c584a..79cd8a3 100644
--- a/facetapi.js
+++ b/facetapi.js
@@ -9,10 +9,11 @@ Drupal.behaviors.facetapi = {
     for (var index in settings.facetapi.facets) {
       if ('block' == settings.facetapi.facets[index].realmName) {
         if (null != settings.facetapi.facets[index].makeCheckboxes) {
+          var id = '#' + settings.facetapi.facets[index].id;
           // Find all checkbox facet links and give them a checkbox.
-          $('a.facetapi-checkbox.facetapi-inactive', context).each(Drupal.facetapi.addCheckbox);
+          $(id + ' a.facetapi-inactive', context).each(Drupal.facetapi.addCheckboxBefore);
           // Find all unclick links and turn them into checkboxes.
-          $('a.facetapi-checkbox.facetapi-active', context).each(Drupal.facetapi.makeCheckbox);
+          $(id + ' a.facetapi-active', context).each(Drupal.facetapi.makeCheckboxChecked);
         }
         if (null != settings.facetapi.facets[index].limit) {
           // Applies soft limit to the list.
@@ -71,7 +72,10 @@ Drupal.facetapi.Redirect.prototype.gotoHref = function() {
   window.location.href = this.href;
 }
 
-Drupal.facetapi.addCheckbox = function() {
+/**
+ * Add an unchecked checkbox before the facet link.
+ */
+Drupal.facetapi.addCheckboxBefore = function() {
   if (!$(this).hasClass('facetapi-checkbox-processed')) {
     // Create an unchecked checkbox.
     var checkbox = $('<input type="checkbox" class="facetapi-checkbox" />');
@@ -80,11 +84,14 @@ Drupal.facetapi.addCheckbox = function() {
     redirect = new Drupal.facetapi.Redirect(href);
     checkbox.click($.proxy(redirect, 'gotoHref'));
     $(this).before(checkbox).before('&nbsp;');
-    $(this).addClass('facetapi-checkbox-processed');
+    $(this).removeClass('facetapi-checkbox').addClass('facetapi-checkbox-processed');
   }
 }
 
-Drupal.facetapi.makeCheckbox = function() {
+/**
+ * Replace an unclick link with a checked checkbox.
+ */
+Drupal.facetapi.makeCheckboxChecked = function() {
   if (!$(this).hasClass('facetapi-checkbox-processed')) {
     // Create a checked checkbox.
     var checkbox = $('<input type="checkbox" class="facetapi-checkbox" checked="true" />');
@@ -94,7 +101,7 @@ Drupal.facetapi.makeCheckbox = function() {
     checkbox.click($.proxy(redirect, 'gotoHref'));
     // Add the checkbox, hide the link.
     $(this).before(checkbox).hide();
-    $(this).addClass('facetapi-checkbox-processed');
+    $(this).removeClass('facetapi-checkbox').addClass('facetapi-checkbox-processed');
   }
 }