Pagehandler corrections _WIP (Not ready for prod)