map data changes on click
merged upstream