small improvements regarding heatmap selection + locators