--- handlers.inc	2012-08-09 09:27:13.000000000 +0200
+++ handlers.inc	2012-08-11 20:16:33.000000000 +0200
@@ -1086,11 +1086,11 @@
   // (commas) and split the string accordingly. If we have an 'and' operator,
   // spaces are treated as part of the word being split, but otherwise they are
   // treated the same as a plus sign.
-  $or_wildcard = '[^\s+,]';
+  $or_wildcard = '[^+,]';
   $and_wildcard = '[^+,]';
-  if (preg_match("/^({$or_wildcard}+[+ ])+{$or_wildcard}+$/", $str)) {
+  if (preg_match("/^({$or_wildcard}+[+])+{$or_wildcard}+$/", $str)) {
     $handler->operator = 'or';
-    $handler->value = preg_split('/[+ ]/', $str);
+    $handler->value = preg_split('/[+]/', $str);
   }
   elseif (preg_match("/^({$and_wildcard}+,)*{$and_wildcard}+$/", $str)) {
     $handler->operator = 'and';