PRD-4443 and PRD-3343 - Fixes to the even handling on data-tree