diff --git a/facetapi.js b/facetapi.js
index f4c584a..e8db34e 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.addCheckbox);
           // 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.makeCheckbox);
         }
         if (null != settings.facetapi.facets[index].limit) {
           // Applies soft limit to the list.
@@ -80,7 +81,7 @@ Drupal.facetapi.addCheckbox = function() {
     redirect = new Drupal.facetapi.Redirect(href);
     checkbox.click($.proxy(redirect, 'gotoHref'));
     $(this).before(checkbox).before(' ');
-    $(this).addClass('facetapi-checkbox-processed');
+    $(this).removeClass('facetapi-checkbox').addClass('facetapi-checkbox-processed');
   }
 }
 
@@ -94,7 +95,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');
   }
 }