Allow group-based queries to have empty answers
Improve collector stream handling as well