fix gift card bugs