JC: more CN. Removed if loop in _search_params partial. All spec passes.