Added login, fixed search