Issue 26: Prevent default fields from overriding saved fields when updating subscriptions