Improve create and update  question from survey perspective