Fix attributes for UserToken and cleanup in Questionnaire controller