diff --git a/plugins/facetapi/widget_links.inc b/plugins/facetapi/widget_links.inc
index 67cc1de..503b3ea 100644
--- a/plugins/facetapi/widget_links.inc
+++ b/plugins/facetapi/widget_links.inc
@@ -79,11 +79,6 @@ class SearchApiRangesWidgetLinks extends FacetapiWidgetLinks {
       '#items' => $items_build,
       '#attributes' => $this->build['#attributes'],
     );
-
-    // Add js.
-    drupal_add_library('system', 'ui.slider');
-    drupal_add_js(drupal_get_path('module', 'search_api_ranges') . '/jquery.numeric.js');
-    drupal_add_js(drupal_get_path('module', 'search_api_ranges') . '/search_api_ranges.js');
   }
 
   /**
diff --git a/plugins/facetapi/widget_select.inc b/plugins/facetapi/widget_select.inc
index d96d808..4bf4156 100644
--- a/plugins/facetapi/widget_select.inc
+++ b/plugins/facetapi/widget_select.inc
@@ -95,11 +95,6 @@ class SearchApiRangesWidgetSelect extends FacetapiWidgetLinks {
       };
       $element = facetapi_ranges_select_facet_form($form_state, $options, $count_select_widget, $active, $remove_facet_url);
     };
-
-    // Add js.
-    drupal_add_library('system', 'ui.slider');
-    drupal_add_js(drupal_get_path('module', 'search_api_ranges') . '/jquery.numeric.js');
-    drupal_add_js(drupal_get_path('module', 'search_api_ranges') . '/search_api_ranges.js');
   }
 
   /**
@@ -196,16 +191,13 @@ class SearchApiRangesWidgetSelect extends FacetapiWidgetLinks {
 }
 
 function facetapi_ranges_select_facet_form($form_state, $options, $count = 0, $active, $first) {
-  //drupal_add_js(drupal_get_path('module', 'facetapi_select') .'/js/facetapi_select.js');
-  //drupal_add_css(drupal_get_path('module', 'facetapi_select').'/default.css');
-
+  $form = array();
+  
   $name = 'facetapi_ranges_select_facet_form_' . $count;
   $query_string = $_GET;
 
   unset($query_string['q']);
   $default_value = url($_GET['q'], array('query' => $query_string));
-  //$default_value = str_replace('%5B', '', $default_value);
-  //$default_value = str_replace('%5D', '', $default_value);
   if ($active['#active'] == TRUE) {
     $i = 0;
     foreach ($options as $key => $label) {
diff --git a/plugins/facetapi/widget_slider.inc b/plugins/facetapi/widget_slider.inc
index 3ad7240..969d979 100644
--- a/plugins/facetapi/widget_slider.inc
+++ b/plugins/facetapi/widget_slider.inc
@@ -20,11 +20,6 @@ class SearchApiRangesWidgetUISlider extends FacetapiWidget {
       '#theme' => 'search_api_ranges_slider' . $theme_suffix,
       '#slider' => $this->_buildUISliderForm(),
     );
-
-    // Add js.
-    drupal_add_library('system', 'ui.slider');
-    drupal_add_js(drupal_get_path('module', 'search_api_ranges') . '/jquery.numeric.js');
-    drupal_add_js(drupal_get_path('module', 'search_api_ranges') . '/search_api_ranges.js');
   }
 
   /**
diff --git a/search_api_ranges.module b/search_api_ranges.module
index 8f6004c..719eded 100644
--- a/search_api_ranges.module
+++ b/search_api_ranges.module
@@ -270,6 +270,12 @@ function search_api_ranges_forms($form_id, $args) {
  */
 function search_api_ranges_block_slider_view_form($form, &$form_state, $variables) {
   $form = array();
+  
+  // Add JS.
+  $module_path = drupal_get_path('module', 'search_api_ranges');
+  $form['#attached']['library'][] = array('system', 'ui.slider');
+  $form['#attached']['js'][] = $module_path . '/jquery.numeric.js';
+  $form['#attached']['js'][] = $module_path . '/search_api_ranges.js';
 
   // For compatibility with Search API ajax,
   // we generate the 'ajax target URL' as a hidden field.
@@ -345,7 +351,7 @@ function search_api_ranges_block_slider_view_form($form, &$form_state, $variable
 
   return $form;
 }
-
+ 
 /**
  * Handle slider block submit
  */