Extracted Search finding logic from Controller to service and minimized code duplication