Update SearchTool

same thing as before...just forgot to delete old stuff, and add comments