Fix bug with conditional questions ordering