Fix issue #17 for geocoding locations

Fix issue #17