diff --git a/chooser.cgi b/chooser.cgi
index 955a43aba..9d66bb6d3 100755
--- a/chooser.cgi
+++ b/chooser.cgi
@@ -164,10 +164,9 @@ location = "chooser.cgi?frame=1&chroot=$uchroot&type=$utype&file="+p;
 }
 </script>
 EOF
-    print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
-	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
 	print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value,'row',true);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-	print "<hr></div>";
+	print "<hr style='width:100%;'></div>";
 	print "<b>",&text('chooser_dir', &html_escape($dir)),"</b>\n";
 	opendir(DIR, $in{'chroot'}.$dir) ||
 		&popup_error(&text('chooser_eopen', "$!"));
@@ -207,6 +206,7 @@ EOF
 	closedir(DIR);
 	print &ui_columns_end();
     if ( $cnt >= 10 ) {
+        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
         print "<script type='text/javascript'>filter_match_box();</script>";
     }
 	&popup_footer();
diff --git a/group_chooser.cgi b/group_chooser.cgi
index 627f0431a..12f6e3d42 100755
--- a/group_chooser.cgi
+++ b/group_chooser.cgi
@@ -71,11 +71,10 @@ if ($in{'multi'}) {
 		print "return false;\n";
 		print "}\n";
 		print "</script>\n";
-        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
 		print "<font size=+1>$text{'groups_all'}</font>\n";
-		print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+		print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
 		print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-		print "<hr></div>";
+		print "<hr style='width:100%;'></div>";
 		print "<table width=100%>\n";
 		my $cnt = 0;
 		foreach $u (&get_groups_list()) {
@@ -87,6 +86,7 @@ if ($in{'multi'}) {
 			}
 		print "</table>\n";
         if ( $cnt >= 10 ) {
+            print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
             print "<script type='text/javascript'>filter_match_box();</script>";
         }
 		&popup_footer();
@@ -160,10 +160,9 @@ else {
 	print "return false;\n";
 	print "}\n";
 	print "</script>\n";
-    print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
-	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;>'";
 	print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-	print "<hr></div>";
+	print "<hr style='width:100%;'></div>";
 	print "<table width=100%>\n";
 	my $cnt = 0;
 	foreach $u (&get_groups_list()) {
@@ -175,6 +174,7 @@ else {
 		}
 	print "</table>\n";
     if ( $cnt >= 10 ) {
+        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
         print "<script type='text/javascript'>filter_match_box();</script>";
     }
 	&popup_footer();
diff --git a/unauthenticated/filter_match.js b/unauthenticated/filter_match.js
index 5d0018b8c..8256b9151 100644
--- a/unauthenticated/filter_match.js
+++ b/unauthenticated/filter_match.js
@@ -62,9 +62,9 @@ function filter_match(str, _cname, _match) {
 function filter_match_box(show) {
     show = show || true;
     if ( true ) {
-        document.getElementsBy('filter_box').style.display='';
+        document.getElementById('filter_box').style.display='';
     } else {
-       document.getElementsBy('filter_box').style.display='none';
+       document.getElementById('filter_box').style.display='none';
     }
 };
 
diff --git a/user_chooser.cgi b/user_chooser.cgi
index 1cbb005b1..8a251f868 100755
--- a/user_chooser.cgi
+++ b/user_chooser.cgi
@@ -63,11 +63,10 @@ if ($in{'multi'}) {
 		print "return false;\n";
 		print "}\n";
 		print "</script>\n";
-        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
 		print "<font size=+1>$text{'users_all'}</font>\n";
-		print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+		print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
 		print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-		print "<hr></div>";
+		print "<hr style='width:100%;'></div>";
 		print "<table width=100%>\n";
         my $cnt = 0;
 		foreach $u (&get_users_list()) {
@@ -80,6 +79,7 @@ if ($in{'multi'}) {
 			}
 		print "</table>\n";
         if ( $cnt >= 10 ) {
+            print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
             print "<script type='text/javascript'>filter_match_box();</script>";
         }
 		&popup_footer();
@@ -152,10 +152,9 @@ else {
 	print "return false;\n";
 	print "}\n";
 	print "</script>\n";
-    print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
-    print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+    print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
     print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-    print "<hr></div>";
+    print "<hr style='width:100%;'></div>";
 	print "<table width=100%>\n";
     my $cnt  = 0;
 	foreach $u (&get_users_list()) {
@@ -167,6 +166,7 @@ else {
 		}
 	print "</table>\n";
     if ( $cnt >= 10 ) {
+        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
         print "<script type='text/javascript'>filter_match_box();</script>";
     }
 	&popup_footer();
diff --git a/useradmin/my_group_chooser.cgi b/useradmin/my_group_chooser.cgi
index 455686c88..07bc03389 100755
--- a/useradmin/my_group_chooser.cgi
+++ b/useradmin/my_group_chooser.cgi
@@ -59,13 +59,12 @@ if ($in{'multi'}) {
 		print "return false;\n";
 		print "}\n";
 		print "</script>\n";
-        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
 		print "<font size=+1>$text{'groups_all'}</font>\n";
-		print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+		print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
 		print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-		print "<hr></div>";
+		print "<hr style='width:100%;'></div>";
 		print "<table width=100%>\n";
-        my $cnt = 0;
+        $cnt = 0;
 		foreach $u (&get_groups_list()) {
 			if ($in{'group'} eq $u->[0]) { print "<tr class='filter_match' $cb>\n"; }
 			else { print "<tr class='filter_match'>\n"; }
@@ -75,6 +74,7 @@ if ($in{'multi'}) {
 			}
 		print "</table>\n";
         if ( $cnt >= 10 ) {
+            print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
             print "<script type='text/javascript'>filter_match_box();</script>";
         }
 		&popup_footer();
@@ -147,10 +147,9 @@ else {
 	print "return false;\n";
 	print "}\n";
 	print "</script>\n";
-    print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
-	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
 	print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-	print "<hr></div>";
+	print "<hr style='width:100%;'></div>";
 	print "<table width=100%>\n";
 	my $cnt = 0;
 	foreach $u (&get_groups_list()) {
@@ -162,6 +161,7 @@ else {
 		}
 	print "</table>\n";
     if ( $cnt >= 10 ) {
+        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
         print "<script type='text/javascript'>filter_match_box();</script>";
     }
 	&popup_footer();
diff --git a/useradmin/my_user_chooser.cgi b/useradmin/my_user_chooser.cgi
index 50005cd5a..4b21d874f 100755
--- a/useradmin/my_user_chooser.cgi
+++ b/useradmin/my_user_chooser.cgi
@@ -51,13 +51,12 @@ if ($in{'multi'}) {
 		print "return false;\n";
 		print "}\n";
 		print "</script>\n";
-        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
 		print "<font size=+1>$text{'users_all'}</font>\n";
-		print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+		print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
 		print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-		print "<hr></div>";
+		print "<hr style='width:100%;'></div>";
 		print "<table width=100%>\n";
-        my $cnt = 0;
+        $cnt = 0;
 		foreach $u (&get_users_list()) {
 			if ($in{'user'} eq $u->[0]) { print "<tr class='filter_match' $cb>\n"; }
 			else { print "<tr class='filter_match'>\n"; }
@@ -68,6 +67,7 @@ if ($in{'multi'}) {
 			}
 		print "</table>\n";
         if ( $cnt >= 10 ) {
+            print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
             print "<script type='text/javascript'>filter_match_box();</script>";
         }
 		&popup_footer();
@@ -140,10 +140,9 @@ else {
 	print "return false;\n";
 	print "}\n";
 	print "</script>\n";
-    print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
-    print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+    print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
     print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-    print "<hr></div>";
+    print "<hr style='width:100%;'></div>";
 	print "<table width=100%>\n";
     my $cnt = 0;
 	foreach $u (&get_users_list()) {
@@ -155,6 +154,7 @@ else {
 		}
 	print "</table>\n";
     if ( $cnt >= 10 ) {
+        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
         print "<script type='text/javascript'>filter_match_box();</script>";
     }
 	&popup_footer();
diff --git a/webmin/standard_chooser.cgi b/webmin/standard_chooser.cgi
index abe8bfb41..d882863a6 100755
--- a/webmin/standard_chooser.cgi
+++ b/webmin/standard_chooser.cgi
@@ -9,10 +9,9 @@ if (!ref($mods)) {
 	print "<b>",&text('standard_failed', $mods),"</b><p>\n";
 	}
 else {
-    print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
-	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
 	print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value,'row',true);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-	print "<hr></div>";
+	print "<hr style='width:100%;'></div>";
 	print "<b>$text{'standard_header'}</b><br>\n";
 	if ($mods->[0]->[1] > &get_webmin_version()) {
 		print &text('standard_warn', $mods->[0]->[1]),"<br>\n";
@@ -26,7 +25,7 @@ else {
 	print "}\n";
 	print "</script>\n";
 	@table = ( );
-    my $cnt = 0;
+    $cnt = 0;
 	foreach $m (@$mods) {
 		my $minfo = { 'os_support' => $m->[3] };
 		next if (!&check_os_support($minfo));
@@ -39,6 +38,7 @@ else {
 	print &ui_columns_table(undef, 100, \@table);
 	}
     if ( $cnt >= 10 ) {
+        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
         print "<script type='text/javascript'>filter_match_box();</script>";
     }
 &ui_print_footer();
diff --git a/webmin/third_chooser.cgi b/webmin/third_chooser.cgi
index 0a68e73ce..23c37553a 100755
--- a/webmin/third_chooser.cgi
+++ b/webmin/third_chooser.cgi
@@ -10,10 +10,9 @@ if (!ref($mods)) {
 	print "<b>",&text('third_failed', $mods),"</b><p>\n";
 	}
 else {
-    print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js'></script>";
-	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;">
+	print "<div id='filter_box' style='display:none;margin:0px;padding:0px;width:100%;clear:both;'>";
 	print &ui_textbox("filter",$text{'ui_filterbox'}, 50, 0, undef,"style='width:100%;' onkeyup=\"filter_match(this.value,'row',true);\" onfocus=\"if (this.value == '".$text{'ui_filterbox'}."') {this.value = '';}\" onblur=\"if (this.value == '') {this.value = '".$text{'ui_filterbox'}."';}\"");
-	print "<hr></div>";
+	print "<hr style='width:100%;'></div>";
 	print "<b>$text{'third_header'}</b><br>\n";
 	print "<script>\n";
 	print "function select(f)\n";
@@ -24,7 +23,7 @@ else {
 	print "}\n";
 	print "</script>\n";
 	@table = ( );
-    my $cnt = 0;
+    $cnt = 0;
 	foreach $m (@$mods) {
 		push(@table, [
 		 "<a href='' onClick='return select(\"$m->[2]\")'>$m->[0]</a>",
@@ -36,6 +35,7 @@ else {
 	print &ui_columns_table(undef, 100, \@table);
 	}
     if ( $cnt >= 10 ) {
+        print "<script type='text/javascript' src='$gconfig{'webprefix'}/unauthenticated/filter_match.js?28112013'></script>";
         print "<script type='text/javascript'>filter_match_box();</script>";
     }
 &popup_footer();