Refs #6343 - parameters are not wrapped

- method_options was extended to accept given option set which allow us to add options from searchables
- all method options was removed as it is not needed