Change param order, add search method