fixed NPE while deleting (some) drafts
merged refactoring for L