ECMS-5094: Refine the page iterator in content selector