Updated with --search-string and TOTO list