Filter: start matching on person_id

If we don't, and for some reason our data is awful and has duplicate
criterion_ids, we get incorrect results