Added searching for users
Fixed merge