Remove references to searchParam
Merge branch 'remove-searchParam' into remove-pluginlib