diff --git a/modules/blog/cms_blog_module.ecf b/modules/blog/cms_blog_module.ecf
index 42ec65c..c3b67e1 100644
--- a/modules/blog/cms_blog_module.ecf
+++ b/modules/blog/cms_blog_module.ecf
@@ -15,6 +15,7 @@
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
 		<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/>
 		<library name="cms_node_module" location="..\..\modules\node\node.ecf" readonly="false"/>
+		<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy.ecf"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
diff --git a/modules/blog/handler/blog_handler.e b/modules/blog/handler/blog_handler.e
index 768b869..6631b18 100644
--- a/modules/blog/handler/blog_handler.e
+++ b/modules/blog/handler/blog_handler.e
@@ -179,6 +179,9 @@ feature -- HTML Output
 					-- Output the title of the post as a link (to the detail page)
 				append_title_html_to (n, page, a_output)
 
+					-- Output associated tags.
+				append_taxonomy_html_to (n, page, a_output)
+
 					-- Output the summary of the post and a more link to the detail page
 				append_summary_html_to (n, page, a_output)
 
@@ -240,7 +243,7 @@ feature -- HTML Output
 		local
 			lnk: CMS_LOCAL_LINK
 		do
-			if attached n.summary as l_summary then
+			if attached n.summary as l_summary and then not l_summary.is_whitespace then
 				lnk := blog_api.node_api.node_link (n)
 				a_output.append ("<p class=%"blog_list_summary%">")
 				if attached api.format (n.format) as f then
@@ -254,6 +257,14 @@ feature -- HTML Output
 			end
 		end
 
+	append_taxonomy_html_to (n: CMS_NODE; page: CMS_RESPONSE; a_output: STRING_8)
+			-- returns a html string with the summary of the node and a link to the detail page
+		do
+			if attached {CMS_TAXONOMY_API} api.module_api ({CMS_TAXONOMY_MODULE}) as l_taxo_api then
+				l_taxo_api.append_taxonomy_to_xhtml (n, page, a_output)
+			end
+		end
+
 	append_pagination_html_to (a_output: STRING)
 			-- Append to `a_output' with the pagination links (if necessary).
 		local