--- service.xml.old	2008-07-17 11:55:13.000000000 +0200
+++ service.xml	2008-07-17 11:05:47.000000000 +0200
@@ -2,7 +2,7 @@
 <table width="100%">
 <tr>
 	<td width="20" tal:content="structure target:cloneImage">Icon</td>
-	<td style="font-size: 20px; font-weight: bold;"><span tal:replace="self/getDescription">Name</span> On <span tal:replace="self/getHost">Host</span></td>
+        <td style="font-size: 20px; font-weight: bold;"><a target="_new" tal:attributes="href string:/wiki/${self/getDescription}">${self/getDescription}</a> on <a target="_new" tal:attributes="href string:/wiki/${self/getHost}">${self/getHost}</a></td>
 	<td align="right">
 		<table>
 		<tr>