diff --git a/search_api_ranges.js b/search_api_ranges.js
index a7580ca..5514346 100644
--- a/search_api_ranges.js
+++ b/search_api_ranges.js
@@ -1,67 +1,50 @@
-(function($){
+(function($) {
   Drupal.behaviors.search_api_ranges = {
-    attach: function(context, settings){
-    
-      var submitTimeout = '';
-      
-      $('div.search-api-ranges-widget').each(function(){
+    attach: function(context, settings) {
+
+      var submitTimeout = -1;
+
+      $('div.search-api-ranges-widget').each(function() {
+
         var widget = $(this);
-        var slider = widget.find('div.range-slider');
-        var rangeMin = widget.find('input[name=range-min]');
-        var rangeMax = widget.find('input[name=range-max]');
         var rangeFrom = widget.find('input[name=range-from]');
         var rangeTo = widget.find('input[name=range-to]');
-        
-        slider.slider({
-          range: true,
-          animate: true,
-          min: parseInt(rangeMin.val()),
-          max: parseInt(rangeMax.val()),
-          values: [parseInt(rangeFrom.val()), parseInt(rangeTo.val())],
-          // for clicking on the bar
-          change: function(event, ui){
-            clearTimeout(submitTimeout);
-            var values = slider.slider("option", "values");
-            widget.find('input[name=range-from]').val(values[0]);
-            widget.find('input[name=range-to]').val(values[1]);
-            delaySubmit(widget);
-          },
-          // for manually sliding
-          slide: function(event, ui){
-            clearTimeout(submitTimeout);
-            var values = slider.slider("option", "values");
-            widget.find('input[name=range-from]').val(values[0]);
-            widget.find('input[name=range-to]').val(values[1]);
-            delaySubmit(widget);
-          }
-        });
-        
-        rangeFrom.bind('keyup', function(){
+
+        rangeFrom.numeric();
+        rangeFrom.bind('change', function() {
           clearTimeout(submitTimeout);
-          var value = parseInt(rangeFrom.val());
-          if (value > parseInt(rangeTo.val())) {
-            value = parseInt(rangeTo.val());
+          if (!isNaN(rangeFrom.val()) && rangeFrom.val() !== '') {
+            var value = parseInt(rangeFrom.val());
+            var maxValue = parseInt(rangeTo.val());
+            if (value > maxValue) {
+              rangeFrom.val(maxValue);
+            }
+            delaySubmit(widget);
           }
-          slider.slider("option", "values", [value, parseInt(rangeTo.val())]);
-          delaySubmit(widget);
         });
-        
-        rangeTo.bind('keyup', function(){
+
+        rangeTo.numeric();
+        rangeTo.bind('change', function() {
           clearTimeout(submitTimeout);
-          var value = parseInt(rangeTo.val());
-          if (value < parseInt(rangeFrom.val())) {
-            value = parseInt(rangeFrom.val());
+          if (!isNaN(rangeTo.val()) && rangeTo.val() !== '') {
+            var value = parseInt(rangeTo.val());
+            var minValue = parseInt(rangeFrom.val());
+            if (value < minValue) {
+              rangeTo.val(minValue);
+            }
+            delaySubmit(widget);
           }
-          slider.slider("option", "values", [parseInt(rangeFrom.val()), value]);
-          delaySubmit(widget);
         });
       });
-      
-      function delaySubmit(widget){
-        submitTimeout = setTimeout(function(){
-          widget.find('form').submit();
-        }, 1500);
-      };
-          }
+
+      function delaySubmit(widget) {
+        var autoSubmitDelay = widget.find('input[name=delay]').val();
+        if (autoSubmitDelay != undefined && autoSubmitDelay != 0) {
+          submitTimeout = setTimeout(function() {
+            widget.find('form').submit();
+          }, autoSubmitDelay);
+        }
+      }
+    }
   };
 })(jQuery);
