refactored search param builders