diff --git a/ckanext/odsh/fanstatic/odsh_rangesearch.js b/ckanext/odsh/fanstatic/odsh_rangesearch.js
deleted file mode 100644
index 1047d7fb9ae82d745c71571f75794e8767a4692b..0000000000000000000000000000000000000000
--- a/ckanext/odsh/fanstatic/odsh_rangesearch.js
+++ /dev/null
@@ -1,32 +0,0 @@
-ckan.module('odsh_rangesearch', function ($)
-{
-    return {
-        initialize: function ()
-        {
-            var start = $("#ext_startdate")
-            var end = $("#ext_enddate")
-            var checkbox = $('#check-rangefilter')
-            var label = $('#rangesearch-label')
-            label.click(function ()
-            {
-                if (label.hasClass('checked'))
-                {
-                    start.val('')
-                    end.val('')
-                }
-                if (!label.hasClass('disabled'))
-                    $('#date-search-form').submit();
-            });
-
-            var updateCheckbox = function ()
-            {
-                var enable = (start.val() || end.val())
-                label.toggleClass('disabled', !enable);
-                if (!enable)
-                    $('#date-search-form').submit();
-            };
-            start.change(updateCheckbox)
-            end.change(updateCheckbox)
-        }
-    };
-});
\ No newline at end of file
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css
index 51c2199f8f5c5e1a2efd35635c09c9ad7a261115..220f3256aa7bac9c95e3c14eece98d2c9cd6e05f 100644
--- a/ckanext/odsh/public/odsh.css
+++ b/ckanext/odsh/public/odsh.css
@@ -320,8 +320,14 @@ label.rangesearch.disabled {
     display: inline-block;
 }
 
+.rangesearch a{
+    color:black;
+    font-size:14px;
+}
+
 .controls input.rangesearch{
-    width:155px;
+    font-style: normal;
+    width:187px;
     padding: 2px;
     font-size: 12px;
     line-height: 1.16666667em;
diff --git a/ckanext/odsh/templates/package/search.html b/ckanext/odsh/templates/package/search.html
index 41319b3d220bead15c099f37acc59be51d0fb21f..56ecd2a74f47b0225108cd70e479bb94ec0ae8d7 100644
--- a/ckanext/odsh/templates/package/search.html
+++ b/ckanext/odsh/templates/package/search.html
@@ -32,17 +32,12 @@ default_extent="{ \"type\": \"Polygon\", \"coordinates\": [[[7.6574,53.1632],[11
   </div>
 
   {% block datereange_search %}
-  {% resource 'odsh/odsh_rangesearch.js' %}
   {% set has_range_filter = request.params.get('ext_startdate') or request.params.get('ext_enddate') %}
-<section class="module module-narrow module-shallow">
-  <nav>
-    <div class="nav-title">{{_('timerange')}}</div>
-    <div class="rangesearch-controls">
-      <form id="date-search-form" method="get" action="{% url_for controller='package', action='search' %}" data-module="odsh_rangesearch">
-        <div class='span1'>
-          <label id="rangesearch-label" class="rangesearch {% if has_range_filter %} checked {%else%} disabled {% endif %}"></label>
-        </div>
-        <div class='span1'>
+  <section class="module module-narrow module-shallow">
+    <nav>
+      <div class="nav-title">{{_('timerange')}}</div>
+      <div class="rangesearch-controls">
+        <form id="date-search-form" method="get" action="{% url_for controller='package', action='search' %}">
           <div class='controls rangesearch'>
             {%- set start = request.params['ext_startdate'] -%}
             {%- set end = request.params['ext_enddate'] -%}
@@ -55,12 +50,12 @@ default_extent="{ \"type\": \"Polygon\", \"coordinates\": [[[7.6574,53.1632],[11
             <label for="ext_enddate">{{_('to')|title}}</label>
             <input id="ext_enddate" name="ext_enddate" type="{{ typeEnd }}" value="{{end}}" placeholder="{{ _('Date') }}"
               {{ onFocus }} class='rangesearch' />
+            <a class='pull-right' href="javascript:{}" onclick="$('#date-search-form').submit();" class="action">{{_('submit date search') }}</a>
           </div>
-        </div>
-      </form>
-    </div>
-  </nav>
-</section>
+        </form>
+      </div>
+    </nav>
+  </section>
   {% endblock %}
 
 </div>