diff --git a/data/index.json b/data/index.json
index 63b1314b..39a975ef 100644
--- a/data/index.json
+++ b/data/index.json
@@ -1 +1 @@
-{"/note/5eeb4790/":["04e663e07741352d72dcb18a0f1a619df4e43a1efac2175e587a8db1c0754397"],"/note/5eecdfdf/":["1b4283153d5dcc6d545ffcc63c1b0142775d59c592d2799c9d51f7a164146647","23840f8abecb05d77ffbe1b887b65586591da8b22c634c619c7911614e5ab562","91e2578f41914b11bbc3a99f01e5e033c6a06950ab2083f0fe11d5f76c1cadd3","e43d91b195939976d4a9c435e0eccd40f602ad0b0716b064a68a6adf08eda5e3"],"":["48311904fc73c58478dbff8d687dcf301b4b407b3bdb29f5b2ad1c24b4e43dbb"]}
\ No newline at end of file
+{"/note/5eeb4790/":["04e663e07741352d72dcb18a0f1a619df4e43a1efac2175e587a8db1c0754397"],"/note/5eecdfdf/":["1b4283153d5dcc6d545ffcc63c1b0142775d59c592d2799c9d51f7a164146647","23840f8abecb05d77ffbe1b887b65586591da8b22c634c619c7911614e5ab562","91e2578f41914b11bbc3a99f01e5e033c6a06950ab2083f0fe11d5f76c1cadd3","e43d91b195939976d4a9c435e0eccd40f602ad0b0716b064a68a6adf08eda5e3","48311904fc73c58478dbff8d687dcf301b4b407b3bdb29f5b2ad1c24b4e43dbb"]}
diff --git a/data/mentions/1b4283153d5dcc6d545ffcc63c1b0142775d59c592d2799c9d51f7a164146647.json b/data/mentions/1b4283153d5dcc6d545ffcc63c1b0142775d59c592d2799c9d51f7a164146647.json
index 80d27683..7ee5d769 100644
--- a/data/mentions/1b4283153d5dcc6d545ffcc63c1b0142775d59c592d2799c9d51f7a164146647.json
+++ b/data/mentions/1b4283153d5dcc6d545ffcc63c1b0142775d59c592d2799c9d51f7a164146647.json
@@ -1 +1 @@
-{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/social.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://social.nipponalba.scot/users/jk"},"url":"https://social.nipponalba.scot/notice/9wFJnxUQfLmV1EqEG8","published":"2020-06-19T16:16:57","wm-received":"2020-06-19T17:34:08Z","wm-id":812459,"wm-source":"https://brid-gy.appspot.com/comment/mastodon/@jk@social.nipponalba.scot/9wFHrwarjwcNUPcniq/9wFJnxUQfLmV1EqEG8","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","content":{"html":"Webhook reply test\n<a class=\"u-mention\" href=\"http://webmention.io/\"></a>\n<a class=\"u-mention\" href=\"https://webmention.io/\"></a>","text":"Webhook reply test"},"inreplyto":"https://jk.nipponalba.scot/note/5eecdfdf/","wmproperty":"in-reply-to","wm-private":false}
+{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/social.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://social.nipponalba.scot/users/jk"},"url":"https://social.nipponalba.scot/notice/9wFJnxUQfLmV1EqEG8","published":"2020-06-19T16:16:57","wm-received":"2020-06-19T17:34:08Z","wm-id":812459,"wm-source":"https://brid-gy.appspot.com/comment/mastodon/@jk@social.nipponalba.scot/9wFHrwarjwcNUPcniq/9wFJnxUQfLmV1EqEG8","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","content":{"html":"Webhook reply test\n<a class=\"u-mention\" href=\"http://webmention.io/\"></a>\n<a class=\"u-mention\" href=\"https://webmention.io/\"></a>","text":"Webhook reply test"},"in-reply-to":"https://jk.nipponalba.scot/note/5eecdfdf/","wm-property":"in-reply-to","wm-private":false}
diff --git a/data/mentions/23840f8abecb05d77ffbe1b887b65586591da8b22c634c619c7911614e5ab562.json b/data/mentions/23840f8abecb05d77ffbe1b887b65586591da8b22c634c619c7911614e5ab562.json
index aed84675..c9b19f2c 100644
--- a/data/mentions/23840f8abecb05d77ffbe1b887b65586591da8b22c634c619c7911614e5ab562.json
+++ b/data/mentions/23840f8abecb05d77ffbe1b887b65586591da8b22c634c619c7911614e5ab562.json
@@ -1 +1 @@
-{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/social.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://social.nipponalba.scot/users/jk"},"url":"https://social.nipponalba.scot/notice/9wFHrwarjwcNUPcniq#favorited-by-1","published":null,"wm-received":"2020-06-19T17:34:09Z","wm-id":812460,"wm-source":"https://brid-gy.appspot.com/like/mastodon/@jk@social.nipponalba.scot/9wFHrwarjwcNUPcniq/1","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","likeof":"https://jk.nipponalba.scot/note/5eecdfdf/","wmproperty":"like-of","wm-private":false}
+{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/social.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://social.nipponalba.scot/users/jk"},"url":"https://social.nipponalba.scot/notice/9wFHrwarjwcNUPcniq#favorited-by-1","published":null,"wm-received":"2020-06-19T17:34:09Z","wm-id":812460,"wm-source":"https://brid-gy.appspot.com/like/mastodon/@jk@social.nipponalba.scot/9wFHrwarjwcNUPcniq/1","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","like-of":"https://jk.nipponalba.scot/note/5eecdfdf/","wm-property":"like-of","wm-private":false}
diff --git a/data/mentions/48311904fc73c58478dbff8d687dcf301b4b407b3bdb29f5b2ad1c24b4e43dbb.json b/data/mentions/48311904fc73c58478dbff8d687dcf301b4b407b3bdb29f5b2ad1c24b4e43dbb.json
index 257736ef..00ca4379 100644
--- a/data/mentions/48311904fc73c58478dbff8d687dcf301b4b407b3bdb29f5b2ad1c24b4e43dbb.json
+++ b/data/mentions/48311904fc73c58478dbff8d687dcf301b4b407b3bdb29f5b2ad1c24b4e43dbb.json
@@ -1 +1 @@
-{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/social.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://social.nipponalba.scot/users/jk"},"url":"https://social.nipponalba.scot/notice/9wFuO872FGAejuRjDU","published":"2020-06-19T23:06:52","wm-received":"2020-06-19T23:08:05Z","wm-id":812563,"wm-source":"https://brid-gy.appspot.com/comment/mastodon/@jk@social.nipponalba.scot/9wFHrwarjwcNUPcniq/9wFuO872FGAejuRjDU","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","content":{"html":"<p>post webhook implementation and php hack reply test</p>\n<a class=\"u-mention\" href=\"http://webmention.io/\"></a>\n<a class=\"u-mention\" href=\"https://webmention.io/\"></a>","text":"post webhook implementation and php hack reply test"},"in-reply-to":"https://jk.nipponalba.scot/note/5eecdfdf/","wm-property":"in-reply-to","wm-private":false}
\ No newline at end of file
+{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/social.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://social.nipponalba.scot/users/jk"},"url":"https://social.nipponalba.scot/notice/9wFuO872FGAejuRjDU","published":"2020-06-19T23:06:52","wm-received":"2020-06-19T23:08:05Z","wm-id":812563,"wm-source":"https://brid-gy.appspot.com/comment/mastodon/@jk@social.nipponalba.scot/9wFHrwarjwcNUPcniq/9wFuO872FGAejuRjDU","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","content":{"html":"<p>post webhook implementation and php hack reply test</p>\n<a class=\"u-mention\" href=\"http://webmention.io/\"></a>\n<a class=\"u-mention\" href=\"https://webmention.io/\"></a>","text":"post webhook implementation and php hack reply test"},"in-reply-to":"https://jk.nipponalba.scot/note/5eecdfdf/","wm-property":"in-reply-to","wm-private":false}
diff --git a/data/mentions/91e2578f41914b11bbc3a99f01e5e033c6a06950ab2083f0fe11d5f76c1cadd3.json b/data/mentions/91e2578f41914b11bbc3a99f01e5e033c6a06950ab2083f0fe11d5f76c1cadd3.json
index 3639c20f..af619077 100644
--- a/data/mentions/91e2578f41914b11bbc3a99f01e5e033c6a06950ab2083f0fe11d5f76c1cadd3.json
+++ b/data/mentions/91e2578f41914b11bbc3a99f01e5e033c6a06950ab2083f0fe11d5f76c1cadd3.json
@@ -1 +1 @@
-{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/jk.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://jk.nipponalba.scot"},"url":"https://jk.nipponalba.scot/response/5eed09e4/","published":"2020-06-19T19:54:00","wm-received":"2020-06-19T18:59:57Z","wm-id":812483,"wm-source":"https://jk.nipponalba.scot/response/5eed09e4/","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","content":{"text":"Reply via indigenous"},"inreplyto":"https://jk.nipponalba.scot/note/5eecdfdf/","wmproperty":"in-reply-to","wm-private":false,"rels":{"canonical":"https://jk.nipponalba.scot/response/5eed09e4/"}}
+{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/jk.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://jk.nipponalba.scot"},"url":"https://jk.nipponalba.scot/response/5eed09e4/","published":"2020-06-19T19:54:00","wm-received":"2020-06-19T18:59:57Z","wm-id":812483,"wm-source":"https://jk.nipponalba.scot/response/5eed09e4/","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","content":{"text":"Reply via indigenous"},"in-reply-to":"https://jk.nipponalba.scot/note/5eecdfdf/","wm-property":"in-reply-to","wm-private":false,"rels":{"canonical":"https://jk.nipponalba.scot/response/5eed09e4/"}}
diff --git a/data/mentions/e43d91b195939976d4a9c435e0eccd40f602ad0b0716b064a68a6adf08eda5e3.json b/data/mentions/e43d91b195939976d4a9c435e0eccd40f602ad0b0716b064a68a6adf08eda5e3.json
index 257736ef..00ca4379 100644
--- a/data/mentions/e43d91b195939976d4a9c435e0eccd40f602ad0b0716b064a68a6adf08eda5e3.json
+++ b/data/mentions/e43d91b195939976d4a9c435e0eccd40f602ad0b0716b064a68a6adf08eda5e3.json
@@ -1 +1 @@
-{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/social.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://social.nipponalba.scot/users/jk"},"url":"https://social.nipponalba.scot/notice/9wFuO872FGAejuRjDU","published":"2020-06-19T23:06:52","wm-received":"2020-06-19T23:08:05Z","wm-id":812563,"wm-source":"https://brid-gy.appspot.com/comment/mastodon/@jk@social.nipponalba.scot/9wFHrwarjwcNUPcniq/9wFuO872FGAejuRjDU","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","content":{"html":"<p>post webhook implementation and php hack reply test</p>\n<a class=\"u-mention\" href=\"http://webmention.io/\"></a>\n<a class=\"u-mention\" href=\"https://webmention.io/\"></a>","text":"post webhook implementation and php hack reply test"},"in-reply-to":"https://jk.nipponalba.scot/note/5eecdfdf/","wm-property":"in-reply-to","wm-private":false}
\ No newline at end of file
+{"type":"entry","author":{"type":"card","name":"J K 🇯🇵🏴󠁧󠁢󠁳󠁣󠁴󠁿","photo":"https://webmention.io/avatar/social.nipponalba.scot/201caaea1889f39529535e829117ad39acdd7db241be2c888363e72bda171c67.jpg","url":"https://social.nipponalba.scot/users/jk"},"url":"https://social.nipponalba.scot/notice/9wFuO872FGAejuRjDU","published":"2020-06-19T23:06:52","wm-received":"2020-06-19T23:08:05Z","wm-id":812563,"wm-source":"https://brid-gy.appspot.com/comment/mastodon/@jk@social.nipponalba.scot/9wFHrwarjwcNUPcniq/9wFuO872FGAejuRjDU","wm-target":"https://jk.nipponalba.scot/note/5eecdfdf/","content":{"html":"<p>post webhook implementation and php hack reply test</p>\n<a class=\"u-mention\" href=\"http://webmention.io/\"></a>\n<a class=\"u-mention\" href=\"https://webmention.io/\"></a>","text":"post webhook implementation and php hack reply test"},"in-reply-to":"https://jk.nipponalba.scot/note/5eecdfdf/","wm-property":"in-reply-to","wm-private":false}
diff --git a/themes/nipponalba/layouts/_default/single.html b/themes/nipponalba/layouts/_default/single.html
index 77f7c058..86626808 100644
--- a/themes/nipponalba/layouts/_default/single.html
+++ b/themes/nipponalba/layouts/_default/single.html
@@ -50,16 +50,16 @@
 {{ $mention_ids := index $.Site.Data.index .RelPermalink }}
 {{ if isset $mention_ids 1}}
 {{ $mentions := apply $mention_ids "index" $.Site.Data.mentions "." }}
-{{ $mentions := sort $mentions "published" }}
+{{ $mentions := sort $mentions "wm-received" }}
 <div class="webmentions">
-  <div class="like interaction"><h4>Likes</h4>{{ range $mentions }}{{ if eq .wmproperty "like-of" }}
+  <div class="like interaction"><h4>Likes</h4>{{ range $mentions }}{{ if eq (index . "wm-property") "like-of" }}
       <a href="{{ .author.url }}"><img class="remote_profile" src="{{ .author.photo }}" title="{{ .author.name }}" alt="{{ .author.name }}" /></a>{{ end}}
   {{ end }}</div>
-  <div class="share interaction"><h4>Shares</h4>{{ range $mentions }}{{ if eq .wmproperty "repost-of" }}
+  <div class="share interaction"><h4>Shares</h4>{{ range $mentions }}{{ if eq (index . "wm-property") "repost-of" }}
       <a href="{{ .author.url }}"><img class="remote_profile" src="{{ .author.photo }}" title="{{ .author.name }}" alt="{{ .author.name }}" /></a>{{ end}}
   {{ end }}</div>
   <h4>Comments & Replies</h4>{{ partial "webmention.html" $mentions }}
-</div>{{end}}
+</div>{{ end }}
 
     </aside>
 </article>
diff --git a/themes/nipponalba/layouts/partials/webmention.html b/themes/nipponalba/layouts/partials/webmention.html
index 4370fa67..e0164c42 100644
--- a/themes/nipponalba/layouts/partials/webmention.html
+++ b/themes/nipponalba/layouts/partials/webmention.html
@@ -1,16 +1,16 @@
 {{ range sort . "published" "asc" }}
 <br/>
-{{if not (eq .wmproperty nil)}}{{ if eq .wmproperty "mention" }}
+{{ if eq (index . "wm-property") "mention" }}
 <div class="mention interaction"><div class="remote_profile"><a href="{{ .author.url }}"><img src="{{ .author.photo }}" /></a></div><div class="intcontent"><div class="intactivity"><a href="{{ .author.url }}">{{ .author.name }}</a> mentioned this post in <a href="{{ .url }}">the post {{  .title }}</a></div>
 <p>{{ .content.text | safeHTML }}</p>
 <time>{{ dateFormat "02/01/2006 15:04 GMT" ( time .published ) }}</time></div></div>
 {{ end }}
-{{ if eq .wmproperty "in-reply-to" }}
+{{ if eq (index . "wm-property") "in-reply-to" }}
 <div class="reply interaction"><div class="remote_profile"><a href="{{ .author.url }}"><img src="{{ .author.photo }}" /></a></div><div class="intcontent"><div class="intactivity"><a href="{{ .author.url }}">{{ .author.name }}</a> replied to this post <a href="{{ .url }}">here</a><br/></div>
 <p>{{ .content.text | safeHTML }}</p>
 <time>{{ dateFormat "02/01/2006 15:04 GMT" ( time .published ) }}</time></div></div>
 {{ end }}
-{{ if eq .wmproperty "bookmark" }}
+{{ if eq (index . "wm-property") "bookmark" }}
 <div class="bookmark interaction"><a href="{{ .author.url }}"><img class="remote_profile" src="{{ .author.photo }}" /></a><a href="{{ .author.url }}">{{ .author.name }}</a> bookmarked this post</div>
-{{ end }}{{end}}
+{{ end }}
 {{ end }}