Index: src/django_gheat/website/static/heatmap_extensions.js
===================================================================
--- src/django_gheat/website/static/heatmap_extensions.js	(revision 9251)
+++ src/django_gheat/website/static/heatmap_extensions.js	(revision 9253)
@@ -42,6 +42,4 @@
     dataset = $('#select_dataset option:selected').text();
     wlnode = $('#select_node option:selected').text();
-//    enc = $('#select_enc option:selected').text();
-//    date = $('#select_date option:selected').text();
     start_date = $('#start_date').val();
     end_date = $('#end_date').val();
@@ -56,6 +54,4 @@
     if (dataset != ''){dataset='&meetrondje__naam='+dataset;} 
     if (wlnode != ''){wlnode='&accespoint__ssid='+wlnode;}
-//    if (enc != ''){enc='&accespoint__encryptie='+enc;} 
-//    if (date != ''){date='&meetrondje__datum='+date;} 
     if (start_date && end_date){
       sd_d=start_date.substr(0,2);
@@ -68,4 +64,18 @@
 
       start_date='&meetrondje__datum__gte=' + sd_y +'-'+ sd_m +'-'+ sd_d;
+      end_date='&meetrondje__datum__lte=' + ed_y +'-'+ ed_m +'-'+ ed_d;
+    }
+    if (start_date && !end_date){
+      sd_d=start_date.substr(0,2);
+      sd_m=start_date.substr(3,2);
+      sd_y=start_date.substr(6,4);
+      start_date='&meetrondje__datum__gte=' + sd_y +'-'+ sd_m +'-'+ sd_d;
+      end_date='';
+    }
+    if (!start_date && end_date){
+      ed_d=end_date.substr(0,2);
+      ed_m=end_date.substr(3,2);
+      ed_y=end_date.substr(6,4);
+      start_date='';
       end_date='&meetrondje__datum__lte=' + ed_y +'-'+ ed_m +'-'+ ed_d;
     }
Index: src/django_gheat/website/templates/home.html
===================================================================
--- src/django_gheat/website/templates/home.html	(revision 9251)
+++ src/django_gheat/website/templates/home.html	(revision 9253)
@@ -2,40 +2,25 @@
 <head>
   <link href="{{ STATIC_URL }}style.css" rel="stylesheet" type="text/css" media="screen" />
+  <link type="text/css" href="{{ STATIC_URL }}jquery-ui-1.8.13.custom.css" rel="Stylesheet" />	
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}jquery-1.6.1.min.js"></script>
-
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}OpenLayers.js"></script>
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}OpenStreetMap.js"></script> 
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}heatmap.js"></script>
-
   <script type="text/javascript" language="javascript" src="{{ STATIC_URL }}jquery.chained.js"></script>
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}heatmap_extensions.js"></script>
   <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}colorpicker.js"></script>
-
-  <!-- jquery UI datapicker -->
-  <link type="text/css" href="{{ STATIC_URL }}jquery-ui-1.8.13.custom.css" rel="Stylesheet" />	
-  <script type="text/javascript" src="{{ STATIC_URL }}jquery-ui-1.8.13.custom.min.js"></script>
-
-
+  <script type="text/javascript" language="Javascript" src="{{ STATIC_URL }}jquery-ui-1.8.13.custom.min.js"></script>
   <script language="javascript" type="text/javascript">
     $(function(){
       $('#colour').colorPicker();
-      $('#start_date, #end_date').datepicker({
+      $('#start_date').datepicker({
         dateFormat: 'dd/mm/yy',
-        beforeShow: setEnd,
+        onSelect: function(dateValue, inst){
+          $('#end_date').datepicker('option', 'minDate', dateValue);
+        }
       });
 
-      function setEnd(element){
-        if (element.id=='end_date'){
-          var start_date = new Date($('#start_date').val());
-          start_date.setDate(start_date.getDate())
-          return {
-            minDate: start_date
-          };
-        }
-      return {}
-      }
-
-      $('#start_date').change(function(){
-        $('#end_date').val('').text('');
+      $('#end_date').datepicker({
+        dateFormat: 'dd/mm/yy',
       });
 
