Page AddOn Event Fixes

@ForumHulp I have sent you a PR here with the fixes needed. If you just merge this PR then that will fix everything.