Add Nominatim search and geolocation, clean up code.