Fix filtered agg 0.7

PR #889 - fix for 0.7