diff --git a/mapentity/static/mapentity/jquery.deserialize.js b/mapentity/static/mapentity/jquery.deserialize.js
index 5f31b613c..517a71e7d 100644
--- a/mapentity/static/mapentity/jquery.deserialize.js
+++ b/mapentity/static/mapentity/jquery.deserialize.js
@@ -47,6 +47,8 @@
           changeChecked($input, true);
         } else if (type == 'checkbox') { 
           // see below
+        } else if ($input.prop("tagName") == 'SELECT') {
+          $input.children("option[value=" + pair[1] + "]").prop("selected", true);
         } else {
           var oldVal = $input.val();
           var newVal = pair[1];
diff --git a/mapentity/static/mapentity/mapentity.context.js b/mapentity/static/mapentity/mapentity.context.js
index 49a0a2337..ac65e4df4 100644
--- a/mapentity/static/mapentity/mapentity.context.js
+++ b/mapentity/static/mapentity/mapentity.context.js
@@ -114,7 +114,7 @@ MapEntity.Context = new function() {
 
         if (filter && context.filter) {
             $(filter).deserialize(context.filter);
-            $(filter).find('select').trigger("liszt:updated");
+            $(filter).find('select').trigger("chosen:updated");
         }
 
         if (datatable && context.sortcolumns) {
diff --git a/mapentity/static/mapentity/mapentity.filter.js b/mapentity/static/mapentity/mapentity.filter.js
index 924777504..6958deb2f 100644
--- a/mapentity/static/mapentity/mapentity.filter.js
+++ b/mapentity/static/mapentity/mapentity.filter.js
@@ -27,7 +27,7 @@ MapEntity.TogglableFilter = L.Class.extend({
         this.$button.mouseenter(this.showinfo.bind(this));
         this.$button.mouseleave(this.hideinfo.bind(this));
 
-        $('#mainfilter').find('select,input').change(function (e) {
+        $('#mainfilter').find('select').change(function (e) {
             self.setfield(this);
         });
 
@@ -36,7 +36,7 @@ MapEntity.TogglableFilter = L.Class.extend({
         $('#mainfilter select[multiple] option:first-child').remove();
         $("form#mainfilter").bind("reset", function() {
             setTimeout(function() {
-                $('form#mainfilter select[multiple]').trigger('liszt:updated');
+                $('form#mainfilter select[multiple]').trigger('chosen:updated');
             }, 1);
         });
         // Make sure filter-set class is added if a choice is selected.