Update notes for submitted changes

* Move parse search logic outside from builder