queries are built via cmd class, no longer a list, which was required to fix multi-value arguments (ie wrap in make-array). incomplete commit, relocating