core-4858 refactor code to fix edge cases. know issue existing
LiveUpdateViewEvent not being called when needed.