event delegation fixes - after migration to dynamic event propagation