Index: src/django_gheat/website/static/heatmap_extensions.js
===================================================================
--- src/django_gheat/website/static/heatmap_extensions.js	(revision 9242)
+++ src/django_gheat/website/static/heatmap_extensions.js	(revision 9243)
@@ -1,3 +1,3 @@
-// Uses zoomlevel en mouseposition to call the nodelist.py view. View returns nodes in json format which is read and printed in document element.
+// Uses zoomlevel and mouseposition to call the nodelist.py view. View returns nodes in json format which is read and printed in document element.
 function getNodeList(zoomlevel, mousepos) {
   $.getJSON("/website/nodelist/" + zoomlevel + "," + mousepos.lat + "," + mousepos.lon, 
@@ -20,15 +20,13 @@
     function(json) {
       $.each(json, function(i,json){
-       // $("<option value='"  + json.gebruiker + "'>" + json.gebruiker + "</option>").appendTo("#select_user");
         $("#select_user").append($("<option/>").attr("value",json.gebruiker).text(json.gebruiker));
         $.each(json.meetrondje, function(m, meetrondje){
-          $("<option class='" + json.gebruiker + "' value='" + meetrondje.naam + "'>"+ meetrondje.naam + "</option>").appendTo("#select_dataset");
+          $("#select_dataset").append($("<option/>").attr({"class":json.gebruiker, "value":meetrondje.naam}).text(meetrondje.naam));
           $.each(meetrondje.nodes, function(n, nodes){
-            $("<option class='" + meetrondje.naam + "' value='" + nodes + "'>" + nodes + "</option>").appendTo("#select_node");
+            $("#select_node").append($("<option/>").attr({"class":meetrondje.naam, "value":nodes}).text(nodes));
           });
-//          $("<option>" + meetrondje.datum + "</option>").appendTo("#select_date");
         });
       });
-// Initiate the chain
+    // Initiate the chain
     $("#select_dataset").chained("#select_user");
     $("#select_node").chained("#select_dataset");
@@ -44,18 +42,14 @@
     dataset = $('#select_dataset option:selected').text();
     wlnode = $('#select_node option:selected').text();
-    enc = $('#select_enc option:selected').text();
-    date = $('#select_date option:selected').text();
+//    enc = $('#select_enc option:selected').text();
+//    date = $('#select_date option:selected').text();
     colour = encodeURIComponent(document.getElementById("colour").value);
     lname = encodeURIComponent(document.getElementById("lname").value);
 
     if (user != ''){user='&meetrondje__gebruiker__naam='+user;}
-    else{user='';}
     if (dataset != ''){dataset='&meetrondje__naam='+dataset;} 
-    else{dataset='';}
-    if (wlnode != ''){wlnode='&accespoint__ssid='+wlnode;} 
-    else{wlnode='';}
-    if (enc != ''){enc='&accespoint__encryptie='+enc;} 
-    if (date != ''){date='&meetrondje__datum='+date;} 
-    else{date='';}
+    if (wlnode != 'All'){wlnode='&accespoint__ssid='+wlnode;}
+//    if (enc != ''){enc='&accespoint__encryptie='+enc;} 
+//    if (date != ''){date='&meetrondje__datum='+date;} 
     if (colour != ''){colour='colour='+colour;} 
     else {colour = '&colour='+Math.floor(Math.random()*256)+','+Math.floor(Math.random()*256)+','+Math.floor(Math.random()*256);}
@@ -68,5 +62,5 @@
       initialize: function(name, options) {
         var url = [
-          baseurl + colour + user + dataset + wlnode + enc + date
+          baseurl + colour + user + dataset + wlnode /* + enc + date */
         ];
         document.getElementById('filter_text').innerHTML+="<br />Added: " + url;
Index: src/django_gheat/website/templates/home.html
===================================================================
--- src/django_gheat/website/templates/home.html	(revision 9242)
+++ src/django_gheat/website/templates/home.html	(revision 9243)
@@ -42,9 +42,7 @@
       <div id="filter_list">
         <form method="get" action="">
-          <select id="select_date" style="width:104px"></select> Date<br />
           <select id="select_user" style="width:104px"></select> User<br />
           <select id="select_dataset" style="width:104px"></select> Dataset<br />
           <select id="select_node" style="width:104px"></select> Node<br />
-          <select id="select_encryption" style="width:104px"></select> Encryption<br />
           <input type="text" id="lname" name="lname" size="10"/> Layername<br />
           <input type="text" id="colour" name="colour" size="10"/> Colour<br />