diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index ae8ab4fc7..0ecbaddce 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,9 +1,9 @@
-import { reduce, filter, sortBy } from 'lodash'
+import { reduce, filter } from 'lodash'
 import Status from '../status/status.vue'
 
 const sortById = (a, b) => {
-  const seqA = Number(a.action.id)
-  const seqB = Number(b.action.id)
+  const seqA = Number(a.id)
+  const seqB = Number(b.id)
   const isSeqA = !Number.isNaN(seqA)
   const isSeqB = !Number.isNaN(seqB)
   if (isSeqA && isSeqB) {
@@ -13,13 +13,13 @@ const sortById = (a, b) => {
   } else if (!isSeqA && isSeqB) {
     return -1
   } else {
-    return a.action.id > b.action.id ? -1 : 1
+    return a.id > b.id ? -1 : 1
   }
 }
 
 const sortAndFilterConversation = (conversation) => {
   conversation = filter(conversation, (status) => status.type !== 'retweet')
-  return sortBy(conversation, sortById)
+  return conversation.filter(_ => _).sort(sortById)
 }
 
 const conversation = {
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index abbc8ddf6..becbab154 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -164,6 +164,7 @@ export const parseStatus = (data) => {
     }
 
     output.summary = data.spoiler_text
+    output.summary_html = data.spoiler_text
     output.external_url = data.url
 
     // FIXME missing!!
@@ -203,6 +204,7 @@ export const parseStatus = (data) => {
     }
 
     output.summary = data.summary
+    output.summary_html = data.summary_html
     output.external_url = data.external_url
     output.is_local = data.is_local
   }