diff --git a/guix-data-service/web/revision/html.scm b/guix-data-service/web/revision/html.scm
index 45d58ec..6b69e4a 100644
--- a/guix-data-service/web/revision/html.scm
+++ b/guix-data-service/web/revision/html.scm
@@ -1103,7 +1103,10 @@ figure {
     `(div
       (@ (class "col-sm-6"))
       (h3 (@ (style "font-family: monospace;"))
-          ,system ,target)
+          ,system
+          ,@(if (string-null? target)
+                '()
+                `((*ENTITY* nbsp) (*ENTITY* rarr) (*ENTITY* nbsp) ,target)))
       (figure
        (div
         (@ (class "figure-content"))
@@ -1229,7 +1232,10 @@ figure {
                                  "substitutes_available_from="
                                  "substitutes_not_available_from=")
                              (number->string build-server-id)
-                             "&system=" system)))
+                             "&system=" system
+                             (if (string-null? target)
+                                   ""
+                                   (string-append "&target=" target)))))
                        ,(format #f "~a (~d, ~2,2f%)"
                                 label
                                 (or count 0)