fix bugs around gift selection and disabling and updating