streaming events rework - fixed capturing phase

The previous two changelists are stupid :)