refactor CustomerSearch class