diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html
index d48bf1a..9df2b4a 100644
--- a/templates/content-episode.tpl.html
+++ b/templates/content-episode.tpl.html
@@ -54,7 +54,8 @@
 		</p>
 <p><!--% IF get_avatar(episode.hostid) != 'hpr_logo.png' %-->
 <img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(episode.hostid) %-->" height="80" width="80" alt="" /></a><br><!--% END %-->
-Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a>. <!--% show_meta(episode) %--></p>
+Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% episode.date %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
+<!--% display_tags(episode.tags) %--> <br>
 	</header>
 	<div><!--% episode.notes %--></div>
 </article>
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index 821ee49..becd8ca 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -56,7 +56,7 @@
 		<p class="meta"$><!--% IF get_avatar(latest_episodes.hostid) != 'hpr_logo.png' %-->
 		<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(latest_episodes.hostid) %-->" height="80" width="80" alt="" /></a><!--% END %-->
 	<br>Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% display_explicit(latest_episodes.explicit) %--> and released under a <!--% latest_episodes.license %--> license. <br>
-<strong>Tags:</strong> <!--% latest_episodes.tags %--><em></em>.<br>
+<!--% display_tags(latest_episodes.tags) %--><br>
 <small>listen in <a href="local/hpr<!--% latest_episodes.id %-->.ogg">ogg</a>, <a href="local/hpr<!--% latest_episodes.id %-->.spx">spx</a>, or <a href="local/hpr<!--% latest_episodes.id %-->.mp3">mp3</a> format. <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %-->
 	<a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html#comments">Comments (<!--% latest_episodes.eps_tally %-->)</a>.</small>
 		</p>
diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html
index 6ebdee1..2feee6c 100644
--- a/templates/shared-episode-summary.tpl.html
+++ b/templates/shared-episode-summary.tpl.html
@@ -1,12 +1,15 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 
-<!--% MACRO show_series(series, series_id)  IF series != "" %-->
-	<label>Series:</label> <a href="<!--% absolute_path(baseurl) %-->series/<!--% zero_pad_left(series_id) %-->.html"><!--% series %--></a>.
+
+<!--% MACRO display_tags(tags) BLOCK %-->
+	<span><label>Tags:</label> <em><!--% tags %--></em>.</span>
+<!--% END %-->
+
 <!--% END %-->
 
 <!--% MACRO show_meta(show) BLOCK %-->
 	<span><label>Released:</label> <!--% show.date %-->.</span> <span><label>Duration:</label> <!--% display_episode_duration(show.duration) %-->.</span> <span><label>Flag:</label> <!--% display_explicit(show.explicit) %-->.</span> <span><!--% show_series(show.series, show.seriesid) %--></span>  <br>
-	<span><label>Tags:</label> <em><!--% show.tags %--></em>.</span>
+	<!--% display_tags(tags) %-->
 <!--% END %-->
 
 <!--% MACRO show_summary(show, hide_host) BLOCK %-->