Refactoring on-click handler
Removed searchbox references