Update state field on change of country. #1684