Fix validator and improviments in questionnaire options