diff --git a/src/components/Comments.astro b/src/components/Comments.astro
index 2c74c2f..b09d335 100644
--- a/src/components/Comments.astro
+++ b/src/components/Comments.astro
@@ -218,7 +218,7 @@ const showPrivate = isOptionOn('open_private_message');
     var uaHtml = uaIcons(c);
 
     return '' +
-      '<li class="comment" id="comment-' + c._id + '">' +
+      '<li class="comment" id="comment-' + c.id + '">' +
         '<div class="contents">' +
           '<div class="comment-arrow">' +
             '<div class="main shadow">' +
@@ -237,19 +237,22 @@ const showPrivate = isOptionOn('open_private_message');
                       '</a>' +
                     '</h4>' +
                   '</div>' +
-                  '<a class="comment-reply-link" data-id="' + c._id + '" data-rid="' + (c.rid || c._id) + '" data-name="' + nick + '">回复</a>' +
+                  '<a class="comment-reply-link" data-id="' + c.id + '" data-rid="' + (c.rid || c.id) + '" data-name="' + nick + '">回复</a>' +
                   '<div class="right">' +
                     '<div class="info">' +
                       '<time datetime="' + new Date(c.created).toISOString() + '">' + timeSince(c.created) + '</time>' +
                       uaHtml +
-                      ' <a class="comment-like-link" data-id="' + c._id + '" style="margin-left:8px;cursor:pointer;">' +
-                        '<i class="iconfont icon-heart_line"></i> <span class="like-count">' + (c.like || 0) + '</span>' +
+                      ' <a class="comment-like-link" data-id="' + c.id + '" style="margin-left:8px;cursor:pointer;">' +
+                        '<i class="iconfont ' + (c.liked ? 'icon-heart' : 'icon-heart_line') + '"></i> <span class="like-count">' + (c.like || 0) + '</span>' +
                       '</a>' +
                     '</div>' +
                   '</div>' +
                 '</section>' +
               '</div>' +
-              '<div class="body">' + (c.comment || '') + '</div>' +
+              '<div class="body">' +
+                (c.ruser ? '<span class="at-user">@' + escapeHtml(c.ruser) + '</span> ' : '') +
+                (c.comment || '') +
+              '</div>' +
             '</div>' +
             '<div class="arrow-left"></div>' +
           '</div>' +