Added ability to search for locations