diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index ffec5ca2e..1e3c2c443 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -2033,11 +2033,11 @@ class AdminControllerCore extends Controller
 		$having_clause = '';
 		if (isset($this->_filterHaving) || isset($this->_having))
 		{
-			 $having_clause = ' HAVING ';
-			 if (isset($this->_filterHaving))
-			 	$having_clause .= ltrim($this->_filterHaving, ' AND ');
-			 if (isset($this->_having))
-			 	$having_clause .= $this->_having.' ';
+			$having_clause = ' HAVING ';
+			if (isset($this->_filterHaving))
+				$having_clause .= ltrim($this->_filterHaving, ' AND ');
+			if (isset($this->_having))
+				$having_clause .= $this->_having.' ';
 		}
 
 		if (strpos($order_by, '.') > 0)
diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php
index e2d4075e2..857c47871 100644
--- a/controllers/admin/AdminFeaturesController.php
+++ b/controllers/admin/AdminFeaturesController.php
@@ -451,6 +451,9 @@ class AdminFeaturesControllerCore extends AdminController
 	 */
 	public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false)
 	{
+		if ($this->table == 'feature_value')
+			$this->_where .= ' AND a.custom = 0';
+		
 		parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop);
 
 		if ($this->table == 'feature')