REfactored search param builder system