add in set-valued queries