Add multi-collection query support