Add scopes for drafting, and checking null for not_deleted scope