diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index ebc6a5b05..e3f9da26e 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -110,7 +110,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 			return null;
 		}
 
-		return \CMDBSource::Quote($aValues[$iIndex]['value']);
+		return addslashes($aValues[$iIndex]['value']);
 	}
 
 	protected static function ContainsToOql($oSearch, $sRef, $aCriteria)
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index ccda37dfe..138f23d95 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -359,7 +359,7 @@ class CriterionConversionTest extends ItopDataTestCase
 			),
 			'string regexp' => array(
 				'OQL' => "SELECT Server WHERE name REGEXP '^dbserver[0-9]+\\\\\\\\..+\\\\\\\\.[a-z]{2,3}$'",
-				'ExpectedOQL' => "SELECT `Server` FROM Server AS `Server` WHERE (`Server`.`name` REGEXP '^dbserver[0-9]+\\\\..+\\\\.[a-z]{2,3}$')",
+				'ExpectedOQL' => "SELECT `Server` FROM Server AS `Server` WHERE (`Server`.`name` REGEXP '^dbserver[0-9]+\\\\\\\\..+\\\\\\\\.[a-z]{2,3}$')",
 				'ExpectedCriterion' => array(array('widget' => 'string', 'operator' => 'REGEXP')),
 			),
 			'enum + key =' => array(