I'm not sure if we should move the filtering of post-aggregators up here.
I think it should be handled in the query tool-chest