diff --git a/rd_ui/app/views/query.html b/rd_ui/app/views/query.html
index 966d58ca68..4a50afb266 100644
--- a/rd_ui/app/views/query.html
+++ b/rd_ui/app/views/query.html
@@ -84,16 +84,16 @@ <h2>
             </div>
         </div>
         <div class="col-md-3 schema-container" ng-show="hasSchema">
-            <div>
+            <div ng-show="schema.length < 100">
                 <input type="text" placeholder="Search schema..." class="form-control" ng-model="schemaFilter">
             </div>
             <div class="schema-browser">
-                <div ng-repeat="table in schema | filter:schemaFilter">
+                <div ng-repeat="table in schema | filter:schemaFilter track by table.name">
                     <div class="table-name" ng-click="table.collapsed = !table.collapsed">
                         <i class="fa fa-table"></i> <strong><span title="{{table.name}}">{{table.name}}</span></strong>
                     </div>
                     <div collapse="table.collapsed && !schemaFilter">
-                        <div ng-repeat="column in table.columns" style="padding-left:16px;">{{column}}</div>
+                        <div ng-repeat="column in table.columns track by column" style="padding-left:16px;">{{column}}</div>
                     </div>
                 </div>
             </div>