diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index 759c703b1..8b9196f93 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -1306,6 +1306,7 @@ class BasePage(object):
                         image.attr += 'height = "%d"'  % height
 
                     descr = html_escape(obj.get_description() )
+                    newpath = self.report.build_url_fname(newpath)
                     image.attr += ' src = "%s" alt = "%s"' % (newpath, descr )
 
                     # return an image
@@ -3761,6 +3762,7 @@ class DownloadPage(BasePage):
                         tbody += trow
 
                         fname = os.path.basename(dlfname1)
+                        # TODO dlfname1 is filename, convert disk path to URL 
                         tcell = Html("td", class_ = "ColumnFilename") + (
                             Html("a", fname, href = dlfname1, title = html_escape(dldescr1))
                         )