diff --git a/js/search/search_form_criteria_string.js b/js/search/search_form_criteria_string.js
index 2391ee4cc..7a2a3ee92 100644
--- a/js/search/search_form_criteria_string.js
+++ b/js/search/search_form_criteria_string.js
@@ -38,8 +38,26 @@ $(function()
 				},
 			},
 		},
-
-   
+		_getOperatorValues: function(oOpElem)
+		{
+			var aValues = [];
+			oOpElem.find('.sfc_op_content input').each(function(){
+				var sValue = $(this).val();
+				aValues.push({value: sValue.replace('_','\\_'), label: sValue});
+			});
+			return aValues;
+		},
+		_setOperatorValues: function(oOpElem, aValues)
+		{
+			if(aValues.length === 0)
+			{
+				return false;
+			}
+			oOpElem.find('.sfc_op_content input').each(function(){
+				$(this).val(aValues[0].value.replace('\\_','_')).trigger('non_interactive_change');
+			});
+			return true;
+		},
 		// the constructor
 		_create: function()
 		{
diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
index cc90ae6f8..0c70778d2 100644
--- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php
@@ -123,7 +123,6 @@ class CriterionToOQL extends CriterionConversionAbstract
 		{
 			return "1";
 		}
-		$sValue = str_replace('_', '\_', $sValue);
 
 		return "({$sRef} LIKE '%{$sValue}%')";
 	}