Adding temporary code/solution to deal with questionnaire inconsistencies