diff --git a/README.rst b/README.rst
index f163509b1d..a4b21b401a 100644
--- a/README.rst
+++ b/README.rst
@@ -16,8 +16,8 @@ Code status
     :alt: End-to-End tests
     :target: https://github.com/phpmyadmin/phpmyadmin/actions/workflows/test-selenium.yml?query=branch%3Amaster
 
-.. image:: https://readthedocs.org/projects/phpmyadmin/badge/?version=latest
-    :target: https://docs.phpmyadmin.net/en/latest/
+.. image:: https://readthedocs.org/projects/phpmyadmin/badge/?version=master
+    :target: https://docs.phpmyadmin.net/en/master/
     :alt: Documentation build status
 
 .. image:: https://hosted.weblate.org/widgets/phpmyadmin/-/master/svg-badge.svg
@@ -40,7 +40,7 @@ Code status
     :alt: Type coverage
     :target: https://shepherd.dev/github/phpmyadmin/phpmyadmin
 
-.. image:: https://badge.stryker-mutator.io/github.com/phpmyadmin/phpmyadmin/master
+.. image:: https://img.shields.io/endpoint?url=https://badge-api.stryker-mutator.io/github.com/phpmyadmin/phpmyadmin/master
     :alt: Infection MSI
     :target: https://infection.github.io
 
diff --git a/public/themes/bootstrap/scss/_tables.scss b/public/themes/bootstrap/scss/_tables.scss
index a32c1febac..5fa4caaaab 100644
--- a/public/themes/bootstrap/scss/_tables.scss
+++ b/public/themes/bootstrap/scss/_tables.scss
@@ -1,3 +1,12 @@
+.table {
+  th,
+  td {
+    > span:empty::before {
+      content: "\200b";
+    }
+  }
+}
+
 @media only screen and (width >= 768px) {
   .table th.position-sticky {
     top: 96px;
diff --git a/public/themes/metro/scss/_tables.scss b/public/themes/metro/scss/_tables.scss
index 3f6c77aa79..d89f6344ff 100644
--- a/public/themes/metro/scss/_tables.scss
+++ b/public/themes/metro/scss/_tables.scss
@@ -17,6 +17,13 @@
     }
   }
 
+  th,
+  td {
+    > span:empty::before {
+      content: "\200b";
+    }
+  }
+
   caption {
     font-family: $font-family-bold;
     background-color: $th-background;
diff --git a/public/themes/original/scss/_tables.scss b/public/themes/original/scss/_tables.scss
index 88e6043608..50dbffd07a 100644
--- a/public/themes/original/scss/_tables.scss
+++ b/public/themes/original/scss/_tables.scss
@@ -11,6 +11,13 @@
     background-color: $th-background;
   }
 
+  th,
+  td {
+    > span:empty::before {
+      content: "\200b";
+    }
+  }
+
   thead th {
     border-bottom: 0;
   }
diff --git a/public/themes/pmahomme/scss/_tables.scss b/public/themes/pmahomme/scss/_tables.scss
index 2fe6640313..15f0554c80 100644
--- a/public/themes/pmahomme/scss/_tables.scss
+++ b/public/themes/pmahomme/scss/_tables.scss
@@ -5,6 +5,10 @@
   td {
     text-shadow: 0 1px 0 #fff;
     vertical-align: middle;
+
+    > span:empty::before {
+      content: "\200b";
+    }
   }
 
   th {
diff --git a/resources/js/src/makegrid.ts b/resources/js/src/makegrid.ts
index c1f1a57098..283280693f 100644
--- a/resources/js/src/makegrid.ts
+++ b/resources/js/src/makegrid.ts
@@ -1604,7 +1604,7 @@ const makeGrid = function (t, enableResize = undefined, enableReorder = undefine
                     isValueUpdated = thisFieldParams[fieldName] !== getCellValue(g.currentEditCell);
                 } else {
                     const JSONString = stringifyJSON(thisFieldParams[fieldName]);
-                    isValueUpdated = JSONString !== JSON.stringify(JSON.parse(getCellValue(g.currentEditCell)));
+                    isValueUpdated = JSONString !== stringifyJSON(getCellValue(g.currentEditCell));
                 }
 
                 if (g.wasEditedCellNull || isValueUpdated) {
diff --git a/src/Display/Results.php b/src/Display/Results.php
index 5911920cf8..4fce39bea8 100644
--- a/src/Display/Results.php
+++ b/src/Display/Results.php
@@ -3123,7 +3123,7 @@ class Results
 
         // 2.1 Prepares a messages with position information
         $sqlQueryMessage = '';
-        if ($displayParts->hasQueryStats) {
+        if ($displayParts->hasQueryStats && $total > 0) {
             $message = $this->setMessageInformation(
                 $sortedColumnMessage,
                 $statementInfo,