Adding people search
Fixed merge conflict