Filter in your filters dawg

Build upon #2307

Fixes the way that filters on filter aggs are created.