diff --git a/pygeoapi/templates/collections/queryables.html b/pygeoapi/templates/collections/queryables.html
index 3690bf0..d95b0e7 100644
--- a/pygeoapi/templates/collections/queryables.html
+++ b/pygeoapi/templates/collections/queryables.html
@@ -16,8 +16,16 @@
       </p>
       <h3>Queryables</h3>
       <ul>
-      {% for queryable in data['queryables'] %}
-        <li>{{ queryable['queryable'] }} (<code>{{ queryable['type'] }}</code>)</li>
+      {% for qname, qinfo in data['properties'].items() %}
+        <li>{{ qname }} (<code>{{ qinfo['type'] }}</code>)
+        {% if 'enum' in qinfo %}
+          <ul>
+          {% for value in qinfo['enum'] %}
+            <li><i>{{ value }}</i></li>
+          {% endfor %}
+          </ul>
+        {% endif %}
+        </li>
       {% endfor %}
       </ul>
     </section>