Fixing new issue with update event
Fixing another paging issue