diff --git a/templates/partials/posts_list.tpl b/templates/partials/posts_list.tpl
index 93fce17..4b2b1df 100644
--- a/templates/partials/posts_list.tpl
+++ b/templates/partials/posts_list.tpl
@@ -11,7 +11,7 @@
 				{posts.content}
 			</div>
 
-			<small class="topic-category">[[global:posted_in, <a href="{config.relative_path}/category/{posts.category.slug}">{posts.category.name}</a>]]</small>
+			<small class="topic-category"><a href="{config.relative_path}/category/{posts.category.slug}">[[global:posted_in, {posts.category.name}]]</a></small>
 
 			<div class="post-info">
 				<a href="{config.relative_path}/user/{posts.user.userslug}">
diff --git a/templates/partials/topic/post-editor.tpl b/templates/partials/topic/post-editor.tpl
index df96bb8..97669c7 100644
--- a/templates/partials/topic/post-editor.tpl
+++ b/templates/partials/topic/post-editor.tpl
@@ -1 +1 @@
-<small data-editor="{editor.userslug}" component="post/editor" class="hidden">[[global:last_edited_by_ago, <strong>{editor.username}</strong>, <span class="timeago" title="{relativeEditTime}"></span>]]</small>
\ No newline at end of file
+<small data-editor="{editor.userslug}" component="post/editor" class="hidden">[[global:last_edited_by, {editor.username}]] <span class="timeago" title="{relativeEditTime}"></span></small>
\ No newline at end of file
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 7d0696e..b102c5f 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -27,7 +27,7 @@
 
 			<i class="fa fa-pencil-square pointer edit-icon <!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"></i>
 
-			<small data-editor="{posts.editor.userslug}" component="post/editor" class="hidden">[[global:last_edited_by_ago, <strong>{posts.editor.username}</strong>, <span class="timeago" title="{posts.relativeEditTime}"></span>]]</small>
+			<small data-editor="{posts.editor.userslug}" component="post/editor" class="hidden">[[global:last_edited_by, {posts.editor.username}]] <span class="timeago" title="{posts.relativeEditTime}"></span></small>
 
 
 			<!-- IF posts.toPid -->
diff --git a/templates/search.tpl b/templates/search.tpl
index e40f929..be4d7f4 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -165,7 +165,7 @@
 								<div class="user-icon user-img" style="background-color: {posts.user.icon:bgColor};">{posts.user.icon:text}</div>
 								<!-- ENDIF posts.user.picture -->
 							</a>
-							[[global:posted_in_ago, <a href="{config.relative_path}/category/{posts.category.slug}"><i class="fa {posts.category.icon}"></i> {posts.category.name}</a>, <span class="timeago" title="{posts.relativeTime}"></span>]]
+							<a href="{config.relative_path}/category/{posts.category.slug}">[[global:posted_in, {posts.category.name}]] <i class="fa {posts.category.icon}"></i> <span class="timeago" title="{posts.relativeTime}"></span></a>
 						</span>
 					</small>
 				</div>