diff --git a/api_db.php b/api_db.php
index ce5006a8..6203d5d1 100644
--- a/api_db.php
+++ b/api_db.php
@@ -269,7 +269,7 @@ if (isset($_GET['topAds']) && $auth)
 	{
 		$limit = " AND timestamp <= :until";
 	}
-	$stmt = $db->prepare('SELECT domain,count(domain) FROM queries WHERE (STATUS == 1 OR STATUS == 4)'.$limit.' GROUP by domain order by count(domain) desc limit 10');
+	$stmt = $db->prepare('SELECT domain,count(domain) FROM queries WHERE (STATUS == 1 OR STATUS > 3)'.$limit.' GROUP by domain order by count(domain) desc limit 10');
 	$stmt->bindValue(":from", intval($_GET['from']), SQLITE3_INTEGER);
 	$stmt->bindValue(":until", intval($_GET['until']), SQLITE3_INTEGER);
 	$results = $stmt->execute();
@@ -401,7 +401,7 @@ if (isset($_GET['getGraphData']) && $auth)
 	$data = array_merge($data, $result);
 
 	// Count blocked queries in intervals
-	$stmt = $db->prepare('SELECT (timestamp/:interval)*:interval interval, COUNT(*) FROM queries WHERE (status == 1 OR status == 4 OR status == 5)'.$limit.' GROUP by interval ORDER by interval');
+	$stmt = $db->prepare('SELECT (timestamp/:interval)*:interval interval, COUNT(*) FROM queries WHERE (status == 1 OR status > 3)'.$limit.' GROUP by interval ORDER by interval');
 	$stmt->bindValue(":from", $from, SQLITE3_INTEGER);
 	$stmt->bindValue(":until", $until, SQLITE3_INTEGER);
 	$stmt->bindValue(":interval", $interval, SQLITE3_INTEGER);
diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js
index 12a92273..7396f23b 100644
--- a/scripts/pi-hole/js/db_queries.js
+++ b/scripts/pi-hole/js/db_queries.js
@@ -198,13 +198,13 @@ var reloadCallback = function () {
   statistics = [0, 0, 0, 0];
   var data = tableApi.rows().data();
   for (var i = 0; i < data.length; i++) {
-    statistics[0]++;
-    if (data[i][4] === 1) {
-      statistics[2]++;
+    statistics[0]++; // TOTAL query
+    if (data[i][4] === 1 || (data[i][4] > 4 && data[i][4] !== 10)) {
+      statistics[2]++; // EXACT blocked
     } else if (data[i][4] === 3) {
-      statistics[1]++;
-    } else if (data[i][4] === 4) {
-      statistics[3]++;
+      statistics[1]++; // CACHE query
+    } else if (data[i][4] === 4 || data[i][4] === 10) {
+      statistics[3]++; // REGEX blocked
     }
   }