Rework of country list setting/getting to fix #58