diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_search.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_search.xml
index a4128f9c85da51917267ebc3297a5c1f940f638b..ea096526aac5f56e3210c0a275445f73647e6aa0 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_search.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_search.xml
@@ -79,6 +79,11 @@ new_mapping = dict()\n
 for key in sorted(request.form.keys()):\n
   # we use sorted to make sure x_search_key appears before x\n
   value = request.form[key]\n
+\n
+  # to remove unnecessary None value\n
+  if value == None:\n
+    request.form.pop(key)\n
+    continue\n
 \n
   # workaround the bogus case where a value is passed ?value=None\n
   if value == \'None\':\n
diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log
index af5f930891a4ab7e75b5f5b6038633f9ee6c0e66..076cf0e3bed68a737ce65c5e6fe0beb3c0eda0d0 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_core/bt/change_log
@@ -1,3 +1,6 @@
+2009-07-13 tatuya
+* Remove None value from the request parameters to prevent creating unnecessary ' is Null' queries when searching via the search dialogs
+
 2009-07-06 nicolas
 * add memcached_plugin_interaction_workflow to update related Distributed Ram Cache Plugins
 
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 1080e3fef427da492654e2130316a2f971078632..11b9a8920af3fafac75dc54143fa19ea09719a1b 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1268
\ No newline at end of file
+1271
\ No newline at end of file