Updated search tool 1