Advances on the choropleth demo