Improved layer switcher for public map