diff --git a/src/page-file.rkt b/src/page-file.rkt
index d3b808d..d112e10 100644
--- a/src/page-file.rkt
+++ b/src/page-file.rkt
@@ -38,7 +38,6 @@
   (define raw-image-url (jp "/rawImageUrl" media-detail))
   (define image-url (jp "/imageUrl" media-detail raw-image-url))
   (define username (jp "/userName" media-detail))
-  (define user-page-url (jp "/userPageUrl" media-detail))
   (define is-posted-in (jp "/isPostedIn" media-detail #f))
   (define smaller-article-list (jp "/smallerArticleList" media-detail))
   (define article-list-is-smaller (jp "/articleListIsSmaller" media-detail))
@@ -54,7 +53,7 @@
            `""
            `(span (a (@ (href ,(u-proxy-url raw-image-url))) "View original file") ". "))
        "Added by "
-       (a (@ (href ,(u-proxy-url user-page-url))) ,username)
+       (a (@ (href ,(format "/~a/wiki/User:~a" wikiname username))) ,username)
        "."
        ,(if is-posted-in
            `(span " Posted in "
@@ -63,15 +62,16 @@
                    (define page-path (jp "/title" article))
                    (define title (jp "/titleText" article page-path))
                    `(span
-                     (a (@ (href ,(format "/~a/wiki/~a" wikiname page-path)))
-                          ,title)
-                     `(if (eq? (car smaller-article-list) article))
+                     ,(if (eq? (car smaller-article-list) article)
                          ""
-                         ", "))
-                 smaller-article-list))
-              `(if (eq? article-list-is-smaller 1)
+                         ", ")
+                     (a (@ (href ,(format "/~a/wiki/~a" wikiname page-path)))
+                          ,title)))
+                 smaller-article-list)
+              ,(if (eq? article-list-is-smaller 1)
                   "…"
-                  "."))))
+                  "."))
+           `"")))
 ;     ,(update-tree-wiki image-description wikiname)
     ))