Subsciption choices are now properly saved.