Adding refactored search controller