Updated all tasks and tests to use base class search fn