Update notes for submitted changes

* Tidy up topic handling.