make new refactor work respect "no updates when DND"