Fix #167 use an aggregator for combining sub queries