Refactored search parameters to hold extra values as extensions