diff --git a/conditor-dumps/04-enrich.ini b/conditor-dumps/04-enrich.ini
index 59f75c8..017178f 100644
--- a/conditor-dumps/04-enrich.ini
+++ b/conditor-dumps/04-enrich.ini
@@ -229,18 +229,15 @@
 noerror = true
 
 [assign]
-path = ws.cartographyCodes
-value = get("ws.libpostal").map(n => n.value?.country?.cartographyCode).uniq()
-
-path = ws.prefLabels
-value = get("ws.libpostal").map(n => n.value?.country?.["prefLabel@en"]).uniq()
-
-[assign]
 path = ApilWsCodeISO
-value = get("ws.cartographyCodes")
+value = get("ws.libpostal") \
+        .map(n => n.value?.country?.cartographyCode) \
+        .uniq().filter(Boolean)
 
 path = ApilWsCountry
-value = get("ws.prefLabels")
+value = get("ws.libpostal") \
+        .map(n => n.value?.country?.["prefLabel@en"]) \
+        .uniq().filter(Boolean)
 
 # Suppression des champs non voulus
 [exchange]