diff --git a/tabellio/searchform/advsearch-pfb.pt b/tabellio/searchform/advsearch-pfb.pt
index 9fdb308..07b6790 100644
--- a/tabellio/searchform/advsearch-pfb.pt
+++ b/tabellio/searchform/advsearch-pfb.pt
@@ -99,6 +99,15 @@ function setup_sort_on(index, elem)
             $('#formfield-document-widgets-l_topics').each(setup_appearance);
             $('#formfield-document-widgets-l_polgroups').each(setup_appearance);
             $('#formfield-document-widgets-sort_on').hide();
+            $('select.date-field').each(function() {
+               $(this).parent().contents().filter(function() {
+                   return (this.nodeType==3 || $(this).hasClass('date-field'));
+                 }).wrapAll('<div class="date-field">');
+            });
+            $('div.date-field').each(function() {
+              var parent = $(this).parent();
+              $(this).detach().appendTo(parent);
+            });
             $('div.advbox form').hide();
             $('div.advbox h2').click(function() { $(this).parent().find('form').toggle(); });
   });
diff --git a/tabellio/searchform/docsearchpfb.pt b/tabellio/searchform/docsearchpfb.pt
index e59e846..e11c5ad 100644
--- a/tabellio/searchform/docsearchpfb.pt
+++ b/tabellio/searchform/docsearchpfb.pt
@@ -158,7 +158,7 @@ function sync_from_checkboxes(elem, dummyinput)
 
 function setup_appearance(index, elem)
 {
-  var dummyinput = $('<input type="text" readonly="readonly"/>');
+  var dummyinput = $('<input class="dummyinput" type="text" readonly="readonly"/>');
   sync_from_checkboxes(elem, dummyinput);
   dummyinput.click(function() {
         $(elem).find('div.droppedcheckboxes').toggle();