diff --git a/src/page-wiki-offline.rkt b/src/page-wiki-offline.rkt
index 906718d..1d0323b 100644
--- a/src/page-wiki-offline.rkt
+++ b/src/page-wiki-offline.rkt
@@ -98,19 +98,16 @@
          #:head-data head-data
          #:siteinfo (siteinfo-fetch wikiname)
          ))
-      (define redirect-query-parameter (dict-ref (url-query (request-uri req)) 'redirect "yes"))
       (define redirect-msg ((query-selector (attribute-selector 'class "redirectMsg") body)))
-      (define redirect-msg-a (if redirect-msg
-                                 ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))
-                                 #f))
+      (define redirect-query-parameter (dict-ref (url-query (request-uri req)) 'redirect "yes"))
       (define headers
         (build-headers
          always-headers
          ; redirect-query-parameter: only the string "no" is significant:
          ; https://github.com/Wikia/app/blob/fe60579a53f16816d65dad1644363160a63206a6/includes/Wiki.php#L367
-         (when (and redirect-msg-a
+         (when (and redirect-msg
                     (not (equal? redirect-query-parameter "no")))
-           (let* ([dest (get-attribute 'href (bits->attributes redirect-msg-a))]
+           (let* ([dest (get-attribute 'href (bits->attributes ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))))]
                   [value (bytes-append #"0;url=" (string->bytes/utf-8 dest))])
              (header #"Refresh" value)))))
       (when (config-true? 'debug)
@@ -126,8 +123,7 @@
     ;; page not found on disk, perhaps it's a redirect? redirects are stored in the database
     (var target (query-maybe-value* "select redirect from page where wikiname = ? and basename = ?" wikiname basename))
     [target
-     ; don't url decode the target, or Category: pages will be interpreted as a protocol
-     (generate-redirect (format "/~a/wiki/~a" wikiname (regexp-replace* #rx"#" target "/")))]
+     (generate-redirect (basename->name-for-query target))]
 
     ;; breezewiki doesn't have the page archived, see if we can make a network request for it
     [(not (config-true? 'feature_offline::only))
diff --git a/src/page-wiki.rkt b/src/page-wiki.rkt
index ae060d4..8df701c 100644
--- a/src/page-wiki.rkt
+++ b/src/page-wiki.rkt
@@ -80,19 +80,16 @@
                #:title title
                #:head-data head-data
                #:siteinfo siteinfo))
-            (define redirect-query-parameter (dict-ref (url-query (request-uri req)) 'redirect "yes"))
             (define redirect-msg ((query-selector (attribute-selector 'class "redirectMsg") body)))
-            (define redirect-msg-a (if redirect-msg
-                                       ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))
-                                       #f))
+            (define redirect-query-parameter (dict-ref (url-query (request-uri req)) 'redirect "yes"))
             (define headers
               (build-headers
                always-headers
                ; redirect-query-parameter: only the string "no" is significant:
                ; https://github.com/Wikia/app/blob/fe60579a53f16816d65dad1644363160a63206a6/includes/Wiki.php#L367
-               (when (and redirect-msg-a
+               (when (and redirect-msg
                           (not (equal? redirect-query-parameter "no")))
-                 (let* ([dest (get-attribute 'href (bits->attributes redirect-msg-a))]
+                 (let* ([dest (get-attribute 'href (bits->attributes ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))))]
                         [value (bytes-append #"0;url=" (string->bytes/utf-8 dest))])
                    (header #"Refresh" value)))))
             (when (config-true? 'debug)