Changes for PageResultPage