Moved the filtering inside the workers again