diff --git a/web/lib/topnav_html.ssjs b/web/lib/topnav_html.ssjs
index c1e7d5889872425b4fc3e7bc9d3bd67321e8ade9..00c8b243f4fc0e32380597bca7429e1f17ff7068 100644
--- a/web/lib/topnav_html.ssjs
+++ b/web/lib/topnav_html.ssjs
@@ -32,20 +32,20 @@ if(http_request.virtual_path=="/msgs/index.ssjs" || http_request.virtual_path=="
 	template.topnav.push({html: '<span class="tlink">Message Groups</span>'});
 
 if(http_request.virtual_path=="/msgs/subs.ssjs")
-	template.topnav.push({html: '<a class="tlink" href="/msgs">Message Groups</a><span class="tlink">%%group:description%%</span>'});
+	template.topnav.push({html: '<a class="tlink" href="/msgs">Message Groups</a><span class="tlink">'+template.group.description+'</span>'});
 
 if(http_request.virtual_path=="/msgs/subinfo.ssjs" && sub!='mail')
-	template.topnav.push({html: '<a class="tlink" href="/msgs">Message Groups</a><a class="tlink" href="/msgs/subs.ssjs?msg_grp='+template.sub.name+'">%%sub:description%%</a><span class="tlink">Sub Information</span>'});
+	template.topnav.push({html: '<a class="tlink" href="/msgs">Message Groups</a><a class="tlink" href="/msgs/subs.ssjs?msg_grp='+template.sub.name+'">'+template.sub.description+'</a><span class="tlink">Sub Information</span>'});
 
 if(http_request.virtual_path=="/msgs/msgs.ssjs" && sub!='mail')
-	template.topnav.push({html: '<a class="tlink" href="index.ssjs">Message Groups</a><a class="tlink" href="subs.ssjs?msg_grp='+template.group.name+'">'+template.group.description+'</a><a class="tlink" href="subinfo.ssjs?msg_sub=^^sub:code^^" title="Click for Sub Info">%%sub:description%%</a>'});
+	template.topnav.push({html: '<a class="tlink" href="index.ssjs">Message Groups</a><a class="tlink" href="subs.ssjs?msg_grp='+template.group.name+'">'+template.group.description+'</a><a class="tlink" href="subinfo.ssjs?msg_sub=^^sub:code^^" title="Click for Sub Info">'+template.sub.description+'</a>'});
 else if(http_request.virtual_path=="/msgs/msgs.ssjs")
-	template.topnav.push({html: '<a class="tlink" href="subinfo.ssjs?msg_sub=^^sub:code^^" title="Click for Sub Info">%%sub:description%%</a>'});
+	template.topnav.push({html: '<a class="tlink" href="subinfo.ssjs?msg_sub=^^sub:code^^" title="Click for Sub Info">'+template.sub.description+'</a>'});
 
 if(http_request.virtual_path=="/msgs/msg.ssjs" && sub!='mail')
-	template.topnav.push({html: '<a class="tlink" href="index.ssjs">Message Groups</a><a class="tlink" href="subs.ssjs?msg_grp='+template.group.name+'">'+template.group.description+'</a><a class="tlink" href="msgs.ssjs?msg_sub=^^sub:code^^">%%sub:description%%</a><span class="tlink">Reading Messages</span>'});
+	template.topnav.push({html: '<a class="tlink" href="index.ssjs">Message Groups</a><a class="tlink" href="subs.ssjs?msg_grp='+template.group.name+'">'+template.group.description+'</a><a class="tlink" href="msgs.ssjs?msg_sub=^^sub:code^^">'+template.sub.description+'</a><span class="tlink">Reading Messages</span>'});
 else if(http_request.virtual_path=="/msgs/msg.ssjs")
-	template.topnav.push({html: '<a class="tlink" href="msgs.ssjs?msg_sub=^^sub:code^^">%%sub:description%%</a><span class="tlink">Reading E-Mail</span>'});
+	template.topnav.push({html: '<a class="tlink" href="msgs.ssjs?msg_sub=^^sub:code^^">'+template.sub.description+'</a><span class="tlink">Reading E-Mail</span>'});
 
 if(sub!='mail' && http_request.virtual_path=="/msgs/post.ssjs")
 	template.topnav.push({html: '<a href="/msgs" class="tlink">Message Groups</a>'});