diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index e900af925f4..63dfa5a51f8 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -314,16 +314,20 @@ abstract class DoliDB implements Database
 	 * Note : This method executes a given SQL query and retrieves the first row of results as an object. It should only be used with SELECT queries
 	 * Dont add LIMIT to your query, it will be added by this method
 	 * @param string $sql the sql query string
-	 * @return bool| object
+	 * @return bool|int|object    false on failure, 0 on empty, object on success
 	 */
 	public function getRow($sql)
 	{
-		$sql .= ' LIMIT 1;';
+		$sql .= ' LIMIT 1';
 
 		$res = $this->query($sql);
-		if ($res)
-		{
-			return $this->fetch_object($res);
+		if ($res) {
+			$obj = $this->fetch_object($res);
+			if ($obj) {
+				return $obj;
+			} else {
+				return 0;
+			}
 		}
 
 		return false;
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index c1b67edaa0e..be055885514 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -75,22 +75,16 @@ if ($search_type != '') {
 }
 
 // Add $param from extra fields
-foreach ($search_array_options as $key => $val)
-{
-	$crit = $val;
-	$tmpkey = preg_replace('/search_options_/', '', $key);
-	$typ = $extrafields->attributes[$object->table_element]['type'][$tmpkey];
-	if ($val != '') {
-		$param .= '&search_options_'.$tmpkey.'='.urlencode($val);
-	}
-	$mode_search = 0;
-	if (in_array($typ, array('int', 'double', 'real'))) $mode_search = 1; // Search on a numeric
-	if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') $mode_search = 2; // Search on a foreign key int
-	if ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
-	{
-		$filter['ef.'.$tmpkey] = natural_search('ef.'.$tmpkey, $crit, $mode_search);
-	}
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+$sql= null;
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+
+// Including the previous script generate the correct SQL filter for all the extrafields
+// we are playing with the behaviour of the Dolresource::fetch_all() by generating a fake
+// extrafields filter key to make it works
+$filter['ef.resource'] = $sql;
+
+
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);