diff --git a/layouts/partials/reply-context.html b/layouts/partials/reply-context.html
index 58c8e53..25ff180 100644
--- a/layouts/partials/reply-context.html
+++ b/layouts/partials/reply-context.html
@@ -11,6 +11,7 @@
 	{{- $replyAuthorRel = "publisher" -}}
 {{- end -}}
 <aside role="note">
+<p>
 	Reply to <span class="h-cite in-reply-to" itemprop="about" itemscope="" itemtype="https://schema.org/{{ $schemaType }}">
 		<cite itemprop="name" class="p-name">
 			<a class="u-url" itemprop="url" href="{{ .replyURI }}">{{ .replyTitle | safeHTML}}</a>
@@ -20,4 +21,5 @@
 				<span itemprop="name" class="p-name fn n">{{ .replyAuthor }}</span></a>
 		</span>
 	</span>
+</p>
 </aside>
diff --git a/layouts/shortcodes/mention-work.html b/layouts/shortcodes/mention-work.html
index e8a20ee..fe57c88 100644
--- a/layouts/shortcodes/mention-work.html
+++ b/layouts/shortcodes/mention-work.html
@@ -4,12 +4,12 @@
 {{- end -}}
 {{- if .Get "p" -}}
 <p
-	class="h-cite{{ with .Get "reply" }} in-reply-to{{ end }}" itemprop="{{ $itemprop }}"{{ with .Get "role" }} role="{{ . }}"{{ end }} itemscope="" itemtype="https://schema.org/{{ .Get "itemtype" }}">
+	class="h-cite{{ with .Get "reply" }} in-reply-to{{ end }}"{{ with .Get "itemid" }} itemid="{{ . }}"{{ end }} itemprop="{{ $itemprop }}"{{ with .Get "role" }} role="{{ . }}"{{ end }} itemscope="" itemtype="https://schema.org/{{ .Get "itemtype" }}">
 	{{- .Inner | markdownify | safeHTML -}}
 </p>
 {{- else -}}
 <span
-	class="h-cite{{ with .Get "reply" }} in-reply-to{{ end }}" itemprop="{{ $itemprop }}"{{ with .Get "role" }} role="{{ . }}"{{ end }} itemscope="" itemtype="https://schema.org/{{ .Get "itemtype" }}">
+	class="h-cite{{ with .Get "reply" }} in-reply-to{{ end }}"{{ with .Get "itemid" }} itemid="{{ . }}"{{ end }} itemprop="{{ $itemprop }}"{{ with .Get "role" }} role="{{ . }}"{{ end }} itemscope="" itemtype="https://schema.org/{{ .Get "itemtype" }}">
 	{{- .Inner | markdownify | safeHTML -}}
 </span>
 {{- end -}}