Changing country selection and state logic