--- a/vault/roadmap.base
+++ b/vault/roadmap.base
@@ -3,13 +3,13 @@
 
 filters:
   and:
-    - file.inFolder("Projects")
-    - status != archived
+    - 'file.inFolder("Projects")'
+    - 'status != "archived"'
 
 formulas:
-  health: if(status == "on-track" && risk == "low", "🟢", if(status == "on-track" && risk == "medium", "🟡", if(status == "at-risk" || risk == high, "🔴", "⚪")))
-  days_remaining: (date(target_date) - today()).round(0)
-  progress_pct: completed_tasks / total_tasks * 100
+  health: 'if(status == "on-track" && risk == "low", "🟢", if(status == "on-track" && risk == "medium", "🟡", if(status == "at-risk" || risk == "high", "🔴", "⚪")))'
+  days_remaining: 'if(target_date, (date(target_date) - today()).days, "")'
+  progress_pct: "completed_tasks / total_tasks * 100"
 
 properties:
   formula.health:
@@ -32,7 +32,7 @@
       - risk
       - target_date
     summaries:
-      formula.progress_pct Average
+      formula.progress_pct: Average
       budget: Sum
     groupBy:
       property: status
@@ -43,8 +43,8 @@
     order:
       - file.name
       - status
-      - formula.health_score
+      - formula.health
       - owner
       - target_date
     filters:
-      - status != "archived"
+      - 'status != "archived"'