[CHORE] Improves map overlay