1 files changed, 5 insertions, 2 deletions
diff --git a/buglist.cgi b/buglist.cgi
index 86fad102e..27e67e390 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -301,8 +301,11 @@ if (defined $::FORM{'sql'}) {
 if ($::FORM{'keywords'}) {
     GetVersionTable();
     my @list;
-    foreach my $v (split(',', $::FORM{'keywords'})) {
-        my $id = $::keywordsbyname{trim($v)};
+    foreach my $v (split(/[\s,]+/, $::FORM{'keywords'})) {
+        if ($v eq '') {
+            next;
+        }
+        my $id = $::keywordsbyname{$v};
         if ($id) {
             push(@list, "keywords.keywordid = $id");
         } else {