various map fixes, grouping POIs