added event filters, but introduced a bug; not pushing to web demo yet