diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeDescriptionFullTextQuery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeDescriptionFullTextQuery.xml
index c064f53164113119ff2bf97c2d4c36b4d06f738a..fd7231c46d631e8af650a59b3baaf891340010a0 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeDescriptionFullTextQuery.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeDescriptionFullTextQuery.xml
@@ -55,7 +55,7 @@
 """\n
 from Products.ZSQLCatalog.SQLCatalog import SimpleQuery\n
 \n
-query = SimpleQuery(**{\'catalog_full_text.fulltext_description\': \'*D+ %s\' % value, \'comparison_operator\': \'match_boolean\'} )\n
+query = SimpleQuery(**{\'catalog_full_text.fulltext_description\': \'*D+ %s\' % value.replace(r\'*\', r\'\\*\').replace(r\'~\', r\'\\~\'), \'comparison_operator\': \'match_boolean\'} )\n
 return query\n
 </string> </value>
         </item>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeTitleFullTextQuery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeTitleFullTextQuery.xml
index 9e20f3de021d2a14c286a1eb9d908daf61a8ec26..9abc316e6fadfb11ba63ad4656dd4a2b0888cce4 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeTitleFullTextQuery.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeTitleFullTextQuery.xml
@@ -55,7 +55,8 @@
 """\n
 from Products.ZSQLCatalog.SQLCatalog import SimpleQuery\n
 \n
-query = SimpleQuery(**{\'catalog_full_text.fulltext_title\': \'*D+ %s\' % value, \'comparison_operator\': \'match_boolean\'} )\n
+query = SimpleQuery(**{\'catalog_full_text.fulltext_title\': \'*D+ %s\' % value.replace(r\'*\', r\'\\*\').replace(r\'~\', r\'\\~\'), \'comparison_operator\': \'match_boolean\'} )\n
+\n
 return query\n
 </string> </value>
         </item>