Further map+label improvements