diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 6731eced1..4521f2e2c 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -549,13 +549,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
             $wi = 0;
             @reset($analyzed_sql[0]['where_clause_identifiers']);
             while(list($wci_nr, $wci) = each($analyzed_sql[0]['where_clause_identifiers'])) {
-                $wi++;
-                // garvin: We only count the even words, because uneven words are the
-                //  contents of the identifies. I guess. ;)
-                if ($wi % 2 != 0) {
-                    $highlightkey = $analyzed_sql[0]['where_clause_identifiers'][$wi-1];
-                    $highlight_columns[$highlightkey] = 'true';
-                }
+                $highlight_columns[$wci] = 'true';
             }
         }
 
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index 3288cbf7f..c0bf03bb5 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -1300,8 +1300,6 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
                    $where_clause .= $arr[$i]['data'] . $sep;
 
                    if (($arr[$i]['type'] == 'quote_backtick')
-                    || ($arr[$i]['type'] == 'quote_double')
-                    || ($arr[$i]['type'] == 'quote_single')
                     || ($arr[$i]['type'] == 'alpha_identifier')) {
                        $where_clause_identifiers[] = $arr[$i]['data'];
                    }