diff --git a/tracking/browser.py b/tracking/browser.py
index e0d8551..69e8549 100644
--- a/tracking/browser.py
+++ b/tracking/browser.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2010 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -103,3 +103,7 @@ class TrackView(object):
     @Lazy
     def timeStamp(self):
         return timeStamp2ISO(self.metadata['timeStamp'])
+
+    def getMetadataTarget(self, key):
+        value = self.metadata.get(key)
+        return dict(title=value, url=None, obj=value)
diff --git a/tracking/track.pt b/tracking/track.pt
index 9b0bb30..89831a0 100644
--- a/tracking/track.pt
+++ b/tracking/track.pt
@@ -16,15 +16,19 @@
       <td tal:content="view/run"></td></tr>
     <tr>
       <td>User:</td>
-      <td><a tal:omit-tag="not:view/userUrl"
-             tal:attributes="href view/userUrl"
+      <td><a tal:define="userUrl view/userUrl|nothing"
+             tal:omit-tag="not:userUrl"
+             tal:attributes="href userUrl"
              tal:content="view/userTitle" /></td></tr>
     <tr>
       <td>Timestamp:</td>
       <td tal:content="view/timeStamp"></td></tr>
     <tr tal:repeat="key view/additionalMetadataFields">
       <td><span tal:replace="key" />:</td>
-      <td tal:content="view/metadata/?key"></td></tr>
+      <td><a tal:define="target python: view.getMetadataTarget(key)"
+             tal:omit-tag="not:target/url"
+             tal:attributes="href target/url"
+             tal:content="python: target['title'] or '???'" /></td></tr>
   </table>
   <h2>Data</h2>
   <div tal:content="context/data" />
diff --git a/tracking/tracks.pt b/tracking/tracks.pt
index 0e92e10..10c3549 100644
--- a/tracking/tracks.pt
+++ b/tracking/tracks.pt
@@ -52,9 +52,10 @@
                    tal:attributes="href item/taskUrl"
                    tal:content="item/taskTitle"></a></td>
             <td tal:content="item/run"></td>
-            <td><a tal:omit-tag="not:item/userUrl"
-                   tal:attributes="href item/userUrl"
-                   tal:content="item/userTitle"></a></td>
+            <td><a tal:define="userUrl view/userUrl|nothing"
+                   tal:omit-tag="not:userUrl"
+                   tal:attributes="href userUrl"
+                   tal:content="item/userTitle|string:???"></a></td>
             <td tal:content="item/timeStamp"></td>
           </tr>
           </tal:list>