refactored Fun.Filter usage