QAART-42 Cleanup, merge two search classes into one