Update notes for submitted changes

* Fix a bug with empty context