Fix issue #17 for geocoding locations