diff --git a/i18n/ar.toml b/i18n/ar.toml
index 80f8091..16f050f 100644
--- a/i18n/ar.toml
+++ b/i18n/ar.toml
@@ -19,7 +19,7 @@ all_tags = "انظر جميع العلامات"
 archived = "الأرشيف"
 author = "الكاتب"
 blog_post_author = "كاتب منشور المدونة"
-boosts_from = "التعزيزات من"
+boosts_from = "$INSTANCE التعزيزات من"
 by_author = "بقلم $AUTHOR"
 caution = "احذر"
 comments = "التعليقات"
@@ -29,7 +29,7 @@ comments_qr = "رمز الاستجابة السريعة لمنشور Mastodon"
 copy_code = "نسخ الرمز"
 disclaimer = "إخلاء المسؤولية"
 drafted = "مسودة"
-faves_from = "المفضلة من"
+faves_from = "$INSTANCE المفضلة من"
 featured = "مميز"
 feed = "موجز"
 file_an_issue = "ملف مشكلة"
@@ -50,7 +50,7 @@ note = "ملاحظة"
 open_post = "افتح المنشور"
 poor = "ضعيف"
 posts = "الوظائف في المجموع"
-posts_with_tag = "المنشورات ذات العلامة"
+posts_with_tag = "$TAG المنشورات ذات العلامة"
 powered_by = "مدعوم من $ZOLA و $DUCKQUILL"
 previous = "السابق"
 published = "منشور"
diff --git a/i18n/en.toml b/i18n/en.toml
index 5672e6f..2847fb4 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -19,7 +19,7 @@ all_tags = "See all tags"
 archived = "Archived"
 author = "Author"
 blog_post_author = "Blog post author"
-boosts_from = "Boosts from"
+boosts_from = "Boosts from $INSTANCE"
 by_author = "By $AUTHOR"
 caution = "Caution"
 comments = "Comments"
@@ -29,7 +29,7 @@ comments_qr = "QR code to a Mastodon post"
 copy_code = "Copy code"
 disclaimer = "Disclaimer"
 drafted = "Drafted"
-faves_from = "Favorites from"
+faves_from = "Favorites from $INSTANCE"
 featured = "Featured"
 feed = "Feed"
 file_an_issue = "File an Issue"
@@ -54,7 +54,7 @@ one_tags = "$NUMBER tag in total"
 open_post = "Open Post"
 poor = "Poor"
 posts = "$NUMBER posts in total"
-posts_with_tag = "Posts with tag"
+posts_with_tag = "Posts with tag $TAG"
 powered_by = "Powered by $ZOLA and $DUCKQUILL"
 previous = "Previous"
 published = "Published on"
diff --git a/i18n/es.toml b/i18n/es.toml
index baf80bf..47866c2 100644
--- a/i18n/es.toml
+++ b/i18n/es.toml
@@ -19,7 +19,7 @@ all_tags = "Ver todas las etiquetas"
 archived = "Archivado"
 author = "Autor"
 blog_post_author = "Autor del post"
-boosts_from = "Boosts de"
+boosts_from = "Boosts de $INSTANCE"
 by_author = "Por $AUTHOR"
 caution = "Precaución"
 comments = "Comentarios"
@@ -29,7 +29,7 @@ comments_qr = "Código QR al post de Mastodon"
 copy_code = "Copiar código"
 disclaimer = "Advertencia"
 drafted = "Borrador"
-faves_from = "Favoritos de"
+faves_from = "Favoritos de $INSTANCE"
 featured = "Recomendado"
 feed = "Feed"
 file_an_issue = "Reportar un problema"
@@ -54,7 +54,7 @@ one_tags = "$NUMBER etiqueta en total"
 open_post = "Abrir publicación"
 poor = "Pobre"
 posts = "$NUMBER publicaciones en total"
-posts_with_tag = "Publicaciones con etiqueta"
+posts_with_tag = "Publicaciones con etiqueta $TAG"
 powered_by = "Desarrollado por $ZOLA y $DUCKQUILL"
 previous = "Anterior"
 published = "Publicado el"
diff --git a/i18n/fa.toml b/i18n/fa.toml
index e14bfad..e2b0bcf 100644
--- a/i18n/fa.toml
+++ b/i18n/fa.toml
@@ -19,7 +19,7 @@ all_tags = "دیدن تمامی برچسب ها"
 archived = "بایگانی شده"
 author = "نویسنده"
 blog_post_author = "نویسنده‌ی این مطلب"
-boosts_from = "تقویت از"
+boosts_from = "$INSTANCE تقویت از"
 by_author = "از $AUTHOR"
 caution = "توجه"
 comments = "نظرات"
@@ -29,7 +29,7 @@ comments_qr = "کد QR فرسته‌ی Mastadon"
 copy_code = "کپی کردن کد"
 disclaimer = "سلب مسئولیت"
 drafted = "پیش نویس"
-faves_from = "محبوب ها از"
+faves_from = "$INSTANCE محبوب ها از"
 featured = "برجسته"
 feed = "جارزن"
 file_an_issue = "گزارش ایراد"
@@ -54,7 +54,7 @@ one_tags = "$NUMBER برچسب در کل"
 open_post = "باز کردن مطلب"
 poor = "ضعیف"
 posts = "$NUMBER مطلب در کل"
-posts_with_tag = "مطالب با برچسب"
+posts_with_tag = "$TAG مطالب با برچسب"
 powered_by = "قدرت گرفته از $ZOLA و $DUCKQUILL"
 previous = "قبلی"
 published = "منتشر شده در"
diff --git a/i18n/ms.toml b/i18n/ms.toml
index 4e8391d..0e86e8d 100644
--- a/i18n/ms.toml
+++ b/i18n/ms.toml
@@ -19,7 +19,7 @@ all_tags = "Lihat semua tag"
 archived = "Diarkibkan"
 author = "Pengarang"
 blog_post_author = "Pengarang siaran blog"
-boosts_from = "Galakkan dari"
+boosts_from = "Galakkan dari $INSTANCE"
 by_author = "Dari $AUTHOR"
 caution = "Awas"
 comments = "Komen"
@@ -29,7 +29,7 @@ comments_qr = "Kod QR ke siaran Mastodon"
 copy_code = "Salin kod"
 disclaimer = "Penafian"
 drafted = "Dirangka"
-faves_from = "Kegemaran dari"
+faves_from = "Kegemaran dari $INSTANCE"
 featured = "Ditampilkan"
 feed = "Suapan"
 file_an_issue = "Failkan Isu"
@@ -54,7 +54,7 @@ one_tags = "$NUMBER tag secara kesuluruhan"
 open_post = "Buka siaran"
 poor = "Lapok"
 posts = "$NUMBER siaran secara kesuluruhan"
-posts_with_tag = "Siaran dengan tag"
+posts_with_tag = "Siaran dengan tag $TAG"
 powered_by = "Dikuasakan oleh $ZOLA dengan $DUCKQUILL"
 previous = "Sebelumnya"
 published = "Diterbit pada"
diff --git a/i18n/ru.toml b/i18n/ru.toml
index 1e2dfe1..59a05cb 100644
--- a/i18n/ru.toml
+++ b/i18n/ru.toml
@@ -23,7 +23,7 @@ all_tags = "Показать все теги"
 archived = "Архив"
 author = "Автор"
 blog_post_author = "Автор блог-поста"
-boosts_from = "Продвижения с"
+boosts_from = "Продвижения с $INSTANCE"
 by_author = "От $AUTHOR"
 caution = "Осторожно"
 comments = "Комментарии"
@@ -33,7 +33,7 @@ comments_qr = "QR-код к посту Mastodon"
 copy_code = "Скопировать код"
 disclaimer = "Дисклеймер"
 drafted = "Черновик"
-faves_from = "Избранное с"
+faves_from = "Избранное с $INSTANCE"
 featured = "Подборка"
 feed = "Лента"
 few_minutes_read = "$NUMBER минут чтения"
@@ -61,7 +61,7 @@ one_tags = "Всего $NUMBER тег"
 open_post = "Открыть Пост"
 poor = "Убогое"
 posts = "$NUMBER постов"
-posts_with_tag = "Посты с тегом"
+posts_with_tag = "Посты с тегом $TAG"
 powered_by = "Работает на базе $ZOLA и $DUCKQUILL"
 previous = "Предыдущий"
 published = "Опубликовано"
diff --git a/templates/partials/comments.html b/templates/partials/comments.html
index c96001f..399ad3e 100644
--- a/templates/partials/comments.html
+++ b/templates/partials/comments.html
@@ -304,7 +304,7 @@
 							let boosts = document.createElement("a");
 							boosts.className = "boosts";
 							boosts.setAttribute("href", `${status.url}/reblogs`);
-							boosts.setAttribute("title", `{{ macros_translate::translate(key="boosts_from", default="Boosts from", language_strings=language_strings) }} ${instance}`);
+							boosts.setAttribute("title", `{{ macros_translate::translate(key="boosts_from", default="Boosts from $INSTANCE", language_strings=language_strings) }}`.replace("$INSTANCE", instance));
 
 							let boostsIcon = document.createElement("i");
 							boostsIcon.className = "icon";
@@ -315,7 +315,7 @@
 							let faves = document.createElement("a");
 							faves.className = "faves";
 							faves.setAttribute("href", `${status.url}/favourites`);
-							faves.setAttribute("title", `{{ macros_translate::translate(key="faves_from", default="Favorites from", language_strings=language_strings) }} ${instance}`);
+							faves.setAttribute("title", `{{ macros_translate::translate(key="faves_from", default="Favorites from $INSTANCE", language_strings=language_strings) }}`.replace("$INSTANCE", instance));
 
 							let favesIcon = document.createElement("i");
 							favesIcon.className = "icon";
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index ed00cd1..6027aaf 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -4,7 +4,9 @@
 {%- set date_format = macros_translate::translate(key="date_format", default="%B %d, %Y", language_strings=language_strings) -%}
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
-<h1>{{ macros_translate::translate(key="posts_with_tag", default="Posts with tag", language_strings=language_strings) }} “{{ term.name }}”</h1>
+
+{%- set term_name = "“" ~ term.name ~ "”" -%}
+<h1>{{ macros_translate::translate(key="posts_with_tag", default="Posts with tag $TAG", language_strings=language_strings) | replace(from="$TAG", to=term_name) }}</h1>
 
 <p>
 	<small>