Improve Country/State handling in Geocoding

Use perfect matches in country, or perfect matches in state
before falling  back on lesser feature types.