WIP match_option rewrite

- Removed useless forward of most settings
- Change the way matching a settings is tested