Move the filtering to the collection