Update notes for submitted changes

* Fix before and after searching logic