Choropleth now works on three different modes