fixed api for everything except drafts