Fixed extra substitutions in whquestion responses, and issue not switching from arbs to qvars.