Fixed geocoder to use iso2 if available