Modify the computation of the suitable task - questionnaire answered

Take into account how the questionnaire has been answered for each phase not only for the current phase.