Thinned out filter
Fixed up filter calls