Fix filtered agg 0.7

PR #889 - fix for 0.7 
this is all auto-generated intellij code, by default we usually do same class for simplicity, unless we have a good reason not to.