Update notes for submitted changes

* Avoid dead loop when token is string format