make country_choropleth work again