Added page blocks into the paging class, so it joins the query to select them too