Update user search and bug fix