diff --git a/db_qbe.php b/db_qbe.php
index a5bd7a7e4e..42f6123d71 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -759,7 +759,7 @@ if (isset($Field) && count($Field) > 0) {
                 while ($ind = PMA_DBI_fetch_assoc($ind_rs)) {
                     $col1 = $tab . '.' . $ind['Column_name'];
                     if (isset($col_all[$col1])) {
-                        if ($ind['non_unique'] == 0) {
+                        if ($ind['Non_unique'] == 0) {
                             if (isset($col_where[$col1])) {
                                 $col_unique[$col1] = 'Y';
                             } else {
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index ee266aa137..7594f0c16a 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -504,7 +504,7 @@ class PMA_Index
                 $r .= '</td>';
                 $r .= '<td>' . htmlspecialchars($column->getCardinality()) . '</td>';
                 $r .= '<td>' . htmlspecialchars($column->getCollation()) . '</td>';
-                $r .= '<td>' . htmlspecialchars($column->getNull()) . '</td>';
+                $r .= '<td>' . htmlspecialchars($column->getNull(true)) . '</td>';
 
                 if ($column->getSeqInIndex() == 1) {
                     $r .= '<td ' . $row_span . '>'
@@ -635,7 +635,7 @@ class PMA_Index_Column
      *
      * @var integer
      */
-    protected $_cardinality = 0;
+    protected $_cardinality = null;
 
     public function __construct($params = array())
     {
@@ -679,9 +679,11 @@ class PMA_Index_Column
         return $this->_cardinality;
     }
 
-    public function getNull()
+    public function getNull($as_text = false)
     {
-        return $this->_null;
+        return $as_text
+            ? (!$this->_null || $this->_null == 'NO' ? __('No') : __('Yes'))
+            : $this->_null;
     }
 
     public function getSeqInIndex()