Questionnaire edit improvement