Moved it over to SearchUtil