-<% trace_name = link_to tag.strong(@trace_name), @trace_url %>
+<% trace_name = tag.strong(@trace_name) %>
+<% trace_name = link_to(trace_name, @trace_url) if @trace_url %>
<% trace_description = tag.em(@trace_description) %>
<% if @trace_tags.length > 0 %>
- <% tags = @trace_tags.map(&:tag).join(" ") %>
+ <% tags = safe_join @trace_tags.map { |trace_tag| tag.em trace_tag.tag }, ", " %>
<%= t ".description_with_tags_html", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
<% else %>
<%= t ".description_with_no_tags_html", :trace_name => trace_name, :trace_description => trace_description %>