Update notes for submitted changes

* move filtering mechanism to separate class