diff --git a/pygeoapi/templates/collections/collection.html b/pygeoapi/templates/collections/collection.html
index b96e8c707..2b3904dcc 100644
--- a/pygeoapi/templates/collections/collection.html
+++ b/pygeoapi/templates/collections/collection.html
@@ -28,7 +28,7 @@ <h1>{{ data['title'] }}</h1>
         </div>
       </div>
       <div class="row">
-        <div class="col-sm-12">
+        <div class="col-sm-12 mb-2">
           <div id="collection-map"></div>
         </div>
       </div>
@@ -88,6 +88,23 @@ <h3>{% trans %}Tiles{% endtrans %}</h3>
       {% endfor %}
       {% endif  %}
 
+      {%- if data['data_queries'] -%}
+        <h3>Data Queries</h3>
+        <table class="table table-striped table-bordered">
+        <tr>
+            <th>Query Name</th>
+            <th>Query Location</th>
+        </tr>
+        {% for query_name, query in data['data_queries'].items() %}
+        <tr>
+            <td>{{ query_name }}</td>
+            <td><a title="{{ query_name }}" href="{{ query['link']['href'] }}">{{ query['link']['href'] }}</a></td>
+        </tr>
+        {% endfor %}
+        <caption><em>Note: EDR Queries may require query parameters not provided in the Query Location.</em></caption>
+        </table>
+      {%- endif -%}
+
       {% if 'parameter_names' in data %}
       <h3>Parameters</h3>
       <table class="table table-striped table-bordered">
diff --git a/pygeoapi/templates/collections/edr/query.html b/pygeoapi/templates/collections/edr/query.html
index 73c4e5b48..14ffd2d48 100644
--- a/pygeoapi/templates/collections/edr/query.html
+++ b/pygeoapi/templates/collections/edr/query.html
@@ -270,7 +270,8 @@
 
     var items = new L.GeoJSON(geojson_data, {
         onEachFeature: function (feature, layer) {
-            var html = '<span>' + {% if data['title_field'] %} feature['properties']['{{ data['title_field'] }}'] {% else %} feature.id {% endif %} + '</span>';
+            var url = '{{  data['query_path'] }}/' + feature.id + '?f=html';
+            var html = '<span><a href="' + url + '">' + {% if data['title_field'] %} feature['properties']['{{ data['title_field'] }}'] {% else %} feature.id {% endif %} + '</a></span>';
             layer.bindPopup(html);
         }
     });
diff --git a/pygeoapi/templates/collections/index.html b/pygeoapi/templates/collections/index.html
index 123db386a..ccd9aa5c7 100644
--- a/pygeoapi/templates/collections/index.html
+++ b/pygeoapi/templates/collections/index.html
@@ -4,6 +4,15 @@
 / <a href="{{ data['collections_path'] }}">{% trans %}Collections{% endtrans %}</a>
 {% endblock %}
 {% block body %}
+    {% set collections = namespace(data=false, records=false) %}
+    {% for col in data['collections']  %}
+      {% if col.get('itemType') == 'record' %}
+          {% set collections.records = true %}
+      {% else %}
+          {% set collections.data = true %}
+      {% endif %}
+    {% endfor %}
+    {% if collections.data %}
     <section id="data-collections">
       <h1>{% trans %}Data collections in this service{% endtrans %}</h1>
             <table class="table table-striped table-bordered">
@@ -31,6 +40,8 @@ <h1>{% trans %}Data collections in this service{% endtrans %}</h1>
               </tbody>
             </table>
     </section>
+    {% endif %}
+    {% if collections.records %}
     <section id="record-collections">
       <h1>{% trans %}Record collections in this service{% endtrans %}</h1>
             <table class="table table-striped table-bordered">
@@ -58,4 +69,5 @@ <h1>{% trans %}Record collections in this service{% endtrans %}</h1>
               </tbody>
             </table>
     </section>
+    {% endif %}
 {% endblock %}