Add second subject question handling