Filter in your filters dawg

Build upon #2307. Closes #2306 

Fixes the way that filters on filter aggs are created.
I take it this is the part you were talking about this morning...