Add logic to handle questionnaires from different opportunities