Fixed bug with base layer switcher.
More fixes to the base layer switcher.