fix all the state_or_province issues