diff --git a/index.md b/index.md
index 1ea8aa6..f50902b 100644
--- a/index.md
+++ b/index.md
@@ -17,13 +17,13 @@ Some exercises may have additional, or different, requirements. Those will conta
 
 {% assign exercises = site.pages | where_exp:"page", "page.url contains '/Instructions'" %}
 {% assign grouped_exercises = exercises | group_by: "lab.topic" %}
-{% assign topic_order = "Basic,Intermediate,Advanced,Expert" | split: "," | map: "downcase" %}
+{% assign topic_order = "Basic,Intermediate,Advanced,Expert" | split: "," %}
 {% assign sorted_groups = "" | split: "" %}
 {% for topic in topic_order %}
-{% assign matching_group = grouped_exercises | where_exp: "group", "group.name | downcase == topic" | first %}
-{% if matching_group %}
-{% assign sorted_groups = sorted_groups | push: matching_group %}
-{% endif %}
+  {% assign matching_group = grouped_exercises | where: "name", topic | first %}
+  {% if matching_group %}
+    {% assign sorted_groups = sorted_groups | push: matching_group %}
+  {% endif %}
 {% endfor %}
 
 <ul>