Update notes for submitted changes

* simplify query building logic