streaming events rework - optimizations