diff --git a/presentation/Html.inc b/presentation/Html.inc
index d7b8084..3694df3 100644
--- a/presentation/Html.inc
+++ b/presentation/Html.inc
@@ -55,7 +55,8 @@ function endTableRowCell() {
 }
 
 function generateLink($sTargetPage, $sQueryString, $sLinkText) {
-    return "<a href=\"$sTargetPage?$sQueryString\">$sLinkText</a>\n";
+    $sQueryStringDelimiter = (strstr($sTargetPage, "?") ? "&" : "?");
+    return "<a href=\"$sTargetPage$sQueryStringDelimiter$sQueryString\">$sLinkText</a>\n";
 }
 
 function generateImage($sImageSource) {