Better support for queryStreams, now supporting Options and population