fix filtering issues
Merge branch 'roundproceeds' into testing