diff --git a/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec
index c84c8d86b02..31f3857216c 100644
--- a/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec
+++ b/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec
@@ -5,8 +5,8 @@
 showTables
 SHOW TABLES "geo";
 
- name:s        | type:s
-geo            |BASE TABLE
+ name:s        | type:s     | kind:s
+geo            |BASE TABLE  |INDEX
 ;
 
 // DESCRIBE
diff --git a/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec
index 98176c849f3..f1941161697 100644
--- a/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec
+++ b/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec
@@ -5,8 +5,8 @@
 showTables
 SHOW TABLES "ogc";
 
- name:s        | type:s
-ogc       |BASE TABLE
+ name:s        | type:s      | kind:s
+ogc            |BASE TABLE   |INDEX
 ;
 
 // DESCRIBE
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/Querier.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/Querier.java
index 17e5a79fa4a..1a47d43a6c2 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/Querier.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/Querier.java
@@ -180,7 +180,7 @@ public class Querier {
                 }
             }
 
-            this.data = new PriorityQueue<>(size) {
+            this.data = new PriorityQueue<Tuple<List<?>, Integer>>(size) {
 
                 // compare row based on the received attribute sort
                 // if a sort item is not in the list, it is assumed the sorting happened in ES