diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index ffd6e7026..a4a9159bf 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -9382,7 +9382,7 @@ class AttributePropertySet extends AttributeTable
  */
 abstract class AttributeSet extends AttributeDBFieldVoid
 {
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_SET;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
 	public function __construct($sCode, array $aParams)
 	{
diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
index 5281b9d11..f3798f0a8 100644
--- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
+++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
@@ -722,59 +722,10 @@ class CriterionToSearchForm extends CriterionConversionAbstract
 		return $aCriteria;
 	}
 
+	// TODO New widget based on String but with match
 	protected static function SetToSearchForm($aCriteria, $aFields)
 	{
-		// TODO New widget based on String but with match
 		$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
-		$sOperator = $aCriteria['operator'];
-		switch ($sOperator)
-		{
-			case 'MATCHES':
-				// Nothing special to do
-				if (isset($aCriteria['has_undefined']) && $aCriteria['has_undefined'])
-				{
-					if (!isset($aCriteria['values']))
-					{
-						$aCriteria['values'] = array();
-					}
-					// Convention for 'undefined' tag set
-					$aCriteria['values'][] = array('value' => '', 'label' => Dict::S('Enum:Undefined'));
-				}
-				break;
-
-			case 'OR':
-			case 'ISNULL':
-				$aCriteria['operator'] = CriterionConversionAbstract::OP_EQUALS;
-				if (isset($aCriteria['has_undefined']) && $aCriteria['has_undefined'])
-				{
-					if (!isset($aCriteria['values']))
-					{
-						$aCriteria['values'] = array();
-					}
-					// Convention for 'undefined' tag set
-					$aCriteria['values'][] = array('value' => '', 'label' => Dict::S('Enum:Undefined'));
-				}
-				break;
-
-			case '=':
-				// TODO BUG SPLIT INTO AN 'AND' LIST OF MATCHES
-				$aCriteria['operator'] = CriterionConversionAbstract::OP_EQUALS;
-				if (isset($aCriteria['has_undefined']) && $aCriteria['has_undefined'])
-				{
-					if (!isset($aCriteria['values']))
-					{
-						$aCriteria['values'] = array();
-					}
-					// Convention for 'undefined' tag set
-					$aCriteria['values'][] = array('value' => '', 'label' => Dict::S('Enum:Undefined'));
-				}
-				break;
-
-			default:
-				// Unknown operator
-				$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
-				break;
-		}
 		return $aCriteria;
 	}