Return location on search
Merge branch 'return_location_on_search'