Fix location search
Improve search labels and defaults