Ported changes on tlist_search