Rename comments field to comments_count