refactored out search params