Fixed edit/new draft logic.