--- a/rrdweb/html.py	Sat Jan 30 19:38:16 2010 +0200
+++ b/rrdweb/html.py	Sat Jan 30 20:13:23 2010 +0200
@@ -40,7 +40,7 @@
     def fmt_img_url (self, style, interval, target) :
         return self.img_url % dict(
             prefix      = self.url_prefix,
-            target      = target.name,
+            target      = target,
             style       = style,
             interval    = interval,
         )
@@ -48,32 +48,32 @@
     def fmt_target_url (self, target) :
         return self.target_url % dict(
             prefix      = self.url_prefix,
-            target      = target.name,
+            target      = target,
         )
 
     def overview (self, targets) :
         """
-            Format target listing
+            Format target listing for given list of (target, title) pairs
         """
 
         return self.page(self.tpl('overview', 
             overview_graphs      = '\n'.join(
                 self.tpl('overview-target',
-                    title               = target.title,
+                    title               = title,
                     daily_overview_img  = self.fmt_img_url('overview', 'daily', target),
                     target_url          = self.fmt_target_url(target),
 
-                ) for target in targets
+                ) for target, title in targets
             )
         ))
 
-    def target (self, target) :
+    def target (self, target, title) :
         """
             Format a specific target
         """
         
         return self.page(self.tpl('target',
-            title               = target.title,
+            title               = title,
 
             daily_img           = self.fmt_img_url('detail', 'daily', target),
             weekly_img          = self.fmt_img_url('detail', 'weekly', target),