Add state_code to list of items to fetch from geocoder
Add state_name and state_code and assign correct one where possible

 * Stop assigning state and instead use state_code then state_name