Added limit to paged query