Hello! Honestly, I'm not 100% sure of what should be the best practice for it. The change I made was updating "is_in:country" is_in:country_code" to "addr:". Those tags were added before my mapping.