[TASK] Plumb initial events
[FEATURE] Filtering works but add event may not work