Refactor tab
Simplify search