Added search and fixed the tool