Fixing data loss issue on include/exclude changes.