map and chart data improvements