Index: search.module
===================================================================
--- search.module	(revision 5668)
+++ search.module	(working copy)
@@ -302,7 +302,7 @@
   search_preprocess($text);
 
   // Baseline CJK handling
-  $text = preg_replace_callback('/['. PREG_CLASS_CJK .']+/u', 'search_expand_cjk', $text);
+  // $text = preg_replace_callback('/['. PREG_CLASS_CJK .']+/u', 'search_expand_cjk', $text);
 
   // To improve searching for numerical data such as dates, IP addresses
   // or version numbers, we consider a group of numerical characters
@@ -645,7 +645,7 @@
         $q = _search_parse_query($or, $scorewords);
         if ($q) {
           $queryor[] = $q;
-          $arguments[] = $or;
+          $arguments[] = trim($or);
         }
       }
       if (count($queryor)) {
@@ -657,7 +657,7 @@
       $q = _search_parse_query($key, $scorewords);
       if ($q) {
         $query[] = $q;
-        $arguments[] = $key;
+        $arguments[] = trim($key);
       }
     }
     $matches++;
@@ -666,7 +666,7 @@
     $q = _search_parse_query($key, $scorewords, true);
     if ($q) {
       $query[] = $q;
-      $arguments[] = $key;
+      $arguments[] = trim($key);
     }
   }
   // We separate word-index conditions because they are not needed in the