Fix filtered agg 0.7

PR #889 - fix for 0.7 
using a filtered aggregator should be equivalent to using the underlying aggregator with an actual filter, e.g. `sum(metric if matches(filter))` should always return the same as `sum(metric) where matches(filter)`