#336 Ensure displayed page matches requested page