Simplify pagination and add query for comments.