Handle tags better for drafts.