The filtering should work better now except for aggregates.