added filtering of events and preserving current filter when re-rendering