Update notes for submitted changes

* refactor templates into query_builder