bugfixes to choropleth