Fix for #247
Fixes for scatterplot app by country