Add Geocoder, fix routes