Fixed App.Data to return drafts when necessary