Removed collapsed `withFilter` and `collect` into a single `collect`