Fixes 6343 - params from searchables are not wrapped