Fix baseLayer switcher initial load