Fixes to Choropleth