Correct wrong person ID when searching
Merge branch 'master' into migration