Map now only uses one vector layer for all selection, improved performance