Added search method and mad it compatible with update from client