Subscription editing fixes