Questionnaire fixes

tentative fix to caching issues too