Modify search related option and mappings