Add invtool side of new search features