Move stop filtering and sorting to collection