Fixed user search issue