diff --git a/tabellio/searchform/docsearchpfb.pt b/tabellio/searchform/docsearchpfb.pt
index f194c4b..e59e846 100644
--- a/tabellio/searchform/docsearchpfb.pt
+++ b/tabellio/searchform/docsearchpfb.pt
@@ -202,7 +202,13 @@ function setup_help_icon(index, elem)
             $('#adopteddocument-widgets-session').each(setup_default_session);
             $('div.formHelp').each(setup_help_icon);
             $('select.date-field').each(function() {
-               $(this).parent().find('.date-field').wrapAll('<div class="date-field">');
+               $(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);
             });
             $('#formfield-adopteddocument-widgets-l_doctypes').each(setup_appearance);
             $('#formfield-adopteddocument-widgets-l_topics').each(setup_appearance);