fix some issue with page bundle integration