Fixed #467 and make a draft and published page