Ignore drafts and use regular join, fix #1870