search tool improvements (but not yet working)