Refactored search action
Refactored search action