Fix mishandling of x=foo fields in grouped queries.