Refactored search controllers to use lazy loading