Filter drafts
Small fixes