Improve, update the user view/search functionality