Bug fixes for geocoding