diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index d4c469b2..04c3a771 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -224,7 +224,7 @@ $(document).ready(function() {
                 }
                 else if (data[6] === "1")
                 {
-                    $("td:eq(5)", row).html("NODATA-" + data[1]);
+                    $("td:eq(5)", row).html("NODATA");
                 }
                 else if (data[6] === "2")
                 {
@@ -248,6 +248,11 @@ $(document).ready(function() {
                 $("td:eq(5)", row).css("color","black");
                 $("td:eq(5)", row).html("-");
             }
+            if(data.length > 7 && data[7] > 0)
+            {
+                var content = $("td:eq(5)", row).html();
+                $("td:eq(5)", row).html(content + " (" + (0.1*data[7]).toFixed(1)+"ms)");
+            }
 
         },
         dom: "<'row'<'col-sm-12'f>>" +