Fixed bugs with draft and require field