diff --git a/predevals-config.yml b/predevals-config.yml
index 18a69e03..d1b41ef6 100644
--- a/predevals-config.yml
+++ b/predevals-config.yml
@@ -16,9 +16,7 @@ targets:
   - horizon
   - target_end_date
 eval_sets:
-- eval_set_name: Full season
-  round_filters:
-    min: '2024-11-30'
+- eval_set_name: 2024-2025 season, state level
   task_filters:
     location:
     - "01"
@@ -105,7 +103,43 @@ eval_sets:
     - "2025-05-17"
     - "2025-05-24"
     - "2025-05-31"
-- eval_set_name: Last 4 weeks
+- eval_set_name: 2024-2025 season, US national level
+  task_filters:
+    location:
+    - "US"
+    horizon:
+    - 0
+    - 1
+    - 2
+    - 3
+    reference_date:
+    - "2024-11-30"
+    - "2024-12-07"
+    - "2024-12-14"
+    - "2024-12-21"
+    - "2024-12-28"
+    - "2025-01-04"
+    - "2025-01-11"
+    - "2025-01-18"
+    - "2025-02-01"
+    - "2025-02-08"
+    - "2025-02-15"
+    - "2025-02-22"
+    - "2025-03-01"
+    - "2025-03-08"
+    - "2025-03-15"
+    - "2025-03-22"
+    - "2025-03-29"
+    - "2025-04-05"
+    - "2025-04-12"
+    - "2025-04-19"
+    - "2025-04-26"
+    - "2025-05-03"
+    - "2025-05-10"
+    - "2025-05-17"
+    - "2025-05-24"
+    - "2025-05-31"
+- eval_set_name: Last 4 weeks, state level
   round_filters:
     min: '2024-11-30'
     n_last: 5
@@ -168,33 +202,93 @@ eval_sets:
     - 1
     - 2
     - 3
-    reference_date:
-    - "2024-11-30"
-    - "2024-12-07"
-    - "2024-12-14"
-    - "2024-12-21"
-    - "2024-12-28"
-    - "2025-01-04"
-    - "2025-01-11"
-    - "2025-01-18"
-    - "2025-02-01"
-    - "2025-02-08"
-    - "2025-02-15"
-    - "2025-02-22"
-    - "2025-03-01"
-    - "2025-03-08"
-    - "2025-03-15"
-    - "2025-03-22"
-    - "2025-03-29"
-    - "2025-04-05"
-    - "2025-04-12"
-    - "2025-04-19"
-    - "2025-04-26"
-    - "2025-05-03"
-    - "2025-05-10"
-    - "2025-05-17"
-    - "2025-05-24"
-    - "2025-05-31"
+- eval_set_name: Last 4 weeks, US national level
+  round_filters:
+    min: '2024-11-30'
+    n_last: 5
+  task_filters:
+    location:
+    - "US"
+    horizon:
+    - 0
+    - 1
+    - 2
+    - 3
+- eval_set_name: Last 2 weeks, state level
+  round_filters:
+    min: '2024-11-30'
+    n_last: 3
+  task_filters:
+    location:
+    - "01"
+    - "02"
+    - "04"
+    - "05"
+    - "06"
+    - "08"
+    - "09"
+    - "10"
+    - "11"
+    - "12"
+    - "13"
+    - "15"
+    - "16"
+    - "17"
+    - "18"
+    - "19"
+    - "20"
+    - "21"
+    - "22"
+    - "23"
+    - "24"
+    - "25"
+    - "26"
+    - "27"
+    - "28"
+    - "29"
+    - "30"
+    - "31"
+    - "32"
+    - "33"
+    - "34"
+    - "35"
+    - "36"
+    - "37"
+    - "38"
+    - "39"
+    - "40"
+    - "41"
+    - "42"
+    - "44"
+    - "45"
+    - "46"
+    - "47"
+    - "48"
+    - "49"
+    - "50"
+    - "51"
+    - "53"
+    - "54"
+    - "55"
+    - "56"
+    - "72"
+    horizon:
+    - 0
+    - 1
+    - 2
+    - 3
+- eval_set_name: Last 2 weeks, US national level
+  round_filters:
+    min: '2024-11-30'
+    n_last: 3
+  task_filters:
+    location:
+    - "US"
+    horizon:
+    - 0
+    - 1
+    - 2
+    - 3
 task_id_text:
   location:
     US: United States