[MIE-699] - Updating queries to use response terms in line with AS spec