LocationPicker now switches between modes correctly