PAge update handler refactoring and bug fixes