diff --git a/tabellio/searchform/docsearch.pt b/tabellio/searchform/docsearch.pt
index 235c957..b8ae313 100644
--- a/tabellio/searchform/docsearch.pt
+++ b/tabellio/searchform/docsearch.pt
@@ -203,15 +203,16 @@ function setup_help_link(index, elem)
   var parts = elem.id.split('-');
   var fieldname = parts[parts.length-1];
   var help_link = $('#aide-'+fieldname).clone();
-  console.log('help_link:', help_link);
   if (help_link.length > 0) {
     help_link.text('?');
     $(elem).find('label.horizontal').append(help_link);
+    $(elem).find('span.option label').append(help_link);
   }
 }
 
 (function($) {
   $().ready(function() {
+    $('option[value="--NOVALUE--"]').text('');
     $('div.field').each(setup_help_link);
   });
 })(jQuery);