map: layer selector: refactor