Update notes for submitted changes

* Improve (Selection|FileName)OptionManager handling