Fixed people search
Merged.