Fix page context

@Djeg review and merge please :wink: