Improved geocoding section. Fixes #27