diff --git a/adminer/drivers/elastic.inc.php b/adminer/drivers/elastic.inc.php
index f5d749e8..6a143726 100644
--- a/adminer/drivers/elastic.inc.php
+++ b/adminer/drivers/elastic.inc.php
@@ -229,7 +229,7 @@ if (isset($_GET["elastic"])) {
 			"facets" => array(
 				"count_by_type" => array(
 					"terms" => array(
-						"field" => "_type"
+						"field" => "_type",
 					)
 				)
 			)
@@ -240,10 +240,10 @@ if (isset($_GET["elastic"])) {
 				$return[$table["term"]] = array(
 					"Name" => $table["term"],
 					"Engine" => "table",
-					"Rows" => $table["count"]
+					"Rows" => $table["count"],
 				);
 			}
-			if ($name != "") {
+			if ($name != "" && $name == $table["term"]) {
 				return $return[$name];
 			}
 		}