Fix unintended double yield in country lookup