Reworked handling of multi-paragraph questions