Moved some queries from the CommentService to the CommentRepository where they belong.