Refactoring: SearchToolBar completed