Fixed up Place switcher