Continued development of search tools

(work in progress)