Fix automatic geocoder issues, add more specs