Issue: Filters

- Make sure we only set Filter Flags if they need to be changed (don't update them every time we save)
- Make sure we sure we use the email_id if we have actually set it. Otherwise, we lose what should be set for the Target Channel