Fixed users search so it searches on user id also