Improving location picker, #47