Fix/comments pagination