diff --git a/nextjs-app/components/ComparisonView.tsx b/nextjs-app/components/ComparisonView.tsx
index 8a31110..168d2a5 100644
--- a/nextjs-app/components/ComparisonView.tsx
+++ b/nextjs-app/components/ComparisonView.tsx
@@ -166,7 +166,7 @@ export function ComparisonView({
             ))}
           </optgroup>
           <optgroup label="Equity (Disadvantaged)">
-            {metrics.filter(m => m.category === 'equity').map((metric) => (
+            {metrics.filter(m => m.category === 'disadvantaged').map((metric) => (
               <option key={metric.key} value={metric.key}>{metric.label}</option>
             ))}
           </optgroup>
@@ -176,7 +176,7 @@ export function ComparisonView({
             ))}
           </optgroup>
           <optgroup label="3-Year Trends">
-            {metrics.filter(m => m.category === 'trends').map((metric) => (
+            {metrics.filter(m => m.category === '3yr').map((metric) => (
               <option key={metric.key} value={metric.key}>{metric.label}</option>
             ))}
           </optgroup>
diff --git a/nextjs-app/components/RankingsView.tsx b/nextjs-app/components/RankingsView.tsx
index 12888bd..61a4f27 100644
--- a/nextjs-app/components/RankingsView.tsx
+++ b/nextjs-app/components/RankingsView.tsx
@@ -124,7 +124,7 @@ export function RankingsView({
               ))}
             </optgroup>
             <optgroup label="Equity (Disadvantaged)">
-              {metrics.filter(m => m.category === 'equity').map((metric) => (
+              {metrics.filter(m => m.category === 'disadvantaged').map((metric) => (
                 <option key={metric.key} value={metric.key}>{metric.label}</option>
               ))}
             </optgroup>
@@ -134,7 +134,7 @@ export function RankingsView({
               ))}
             </optgroup>
             <optgroup label="3-Year Trends">
-              {metrics.filter(m => m.category === 'trends').map((metric) => (
+              {metrics.filter(m => m.category === '3yr').map((metric) => (
                 <option key={metric.key} value={metric.key}>{metric.label}</option>
               ))}
             </optgroup>