Updated questionnaire (closes #166). Some updates to the tags table design