diff --git a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py
index d4de589a..97ac96da 100644
--- a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py
+++ b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py
@@ -2119,15 +2119,19 @@ class DataLoader:
             "ECO4 GBIS (ECO+) JJC UNDER 73m² ": "GBIS",
         }
 
+        # Since it seems like "subject to archetype check" has some failure conditions, for simplicity, we
+        # treat these as similar to subject to CIGA, and therefore unconfirmed worked that could fail. There
+        # are only a small volume of properties for which we see this
         eco_eligibility_map = {
             "not eligble": "not eligible",
             "eco 4(subject to ciga)": "eco4 (subject to ciga)",
             "eco4 (subject to ciga/archetype check": "eco4 (subject to ciga)",
-            "eco4 (subject to archetype check)": "eco4",
+            "eco4 (subject to archetype check)": "eco4 (subject to ciga)",
             "eco4 (subject to ciga/archetype)": "eco4 (subject to ciga)",
             "eco4  (subject to ciga)": "eco4 (subject to ciga)",
             "eco4(subject to ciga)": "eco4 (subject to ciga)",
             "eco4 subject to ciga": "eco4 (subject to ciga)",
+            "eco4 (subject to archetype)": "eco4 (subject to ciga)",
         }
 
         ha_facts_and_figures = []
@@ -4525,9 +4529,9 @@ def app():
         "HA48", "HA50", "HA63", "HA107", "HA117"
     ]
     # Next HAs to do: 14 [DONE], 15[DONE], 32 [DONE], 33 [Input format is 4 parts and no eco4 jobs identified - come
-    # back on this], 28 [DONE], 41 [DONE], 50 [DONE], 48 [DONE], 2 [DONE], 63 [DONE], 12 [DONE]
-    # 117 [WIP]
-    # Consider for ECO4: 13
+    # back on this], 28 [DONE], 41 [DONE], 50 [DONE], 48 [DONE], 2 [DONE], 63 [DONE], 12 [DONE], 117 [DONE]
+    # 13 [WIP]
+    # Consider for ECO4:
     # Consider for GBIS: 56, 35, 34
     # Ignore for now:
     # 38 [problematic, but no ECO4], 10 problematic (no eligibility), 20 has barely any in