diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index b4a98946f94..c0a7ecbb437 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -24,11 +24,11 @@ if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_
 				$typeofextrafield=$extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
 				print '<td class="liste_titre'.($align?' '.$align:'').'">';
 				$tmpkey=preg_replace('/'.$search_options_pattern.'/', '', $key);
-				if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
+				if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
 				{
 					$crit=$val;
 					$searchclass='';
-					if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+					if (in_array($typeofextrafield, array('varchar'))) $searchclass='searchstring';
 					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
 					print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';
 				}
@@ -37,7 +37,9 @@ if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_
 					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
 					$morecss='';
 					if ($typeofextrafield == 'sellist') $morecss='maxwidth200';
-					echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss);
+					$keyprefix=$search_options_pattern;
+					if (substr($search_options_pattern, -8) === 'options_') $keyprefix = substr($search_options_pattern, 0,-8);
+					echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $keyprefix, $morecss);
 				}
 				elseif (in_array($typeofextrafield, array('datetime','timestamp')))
 				{