Manage map overlays a bit better