Move search filter check into search class
Refactor search class