Extracted SearchParamsParser and SearchDataParamsParser
Added TODO