Added columns questionnaire_name and questionnaire_location to the Questionnaire table - And, also modified the code to work these new columns