Updated search tool