some progress on the search tool