fix pagination and comments