fixed county_state_mapping