diff --git a/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java b/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java
index bc6d0aeac18..431c85d7c51 100644
--- a/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java
+++ b/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java
@@ -368,6 +368,7 @@ private void populateGenreIfEmpty(DiffData data, InputStream[] inArray) {
             }
         }
     }
+
     private void populateRevisionData(DiffData data) {
         try {
             data.revision = Diff.diff(data.file[0], data.file[1]);
@@ -384,7 +385,7 @@ private void populateRevisionURLDetails(DiffData data, String[] filePath) {
                                 filePath[i] + "@" + data.rev[i], null);
                         data.param[i] = u.getRawQuery();
                     } catch (URISyntaxException e) {
-                        LOGGER.log(Level.WARNING, "Failed to create URI: ", Laundromat.launderLog(e.toString()));
+                        LOGGER.log(Level.WARNING, "Failed to create URI: {}", Laundromat.launderLog(e.toString()));
                     }
                 });
     }
@@ -1219,7 +1220,7 @@ public boolean isDir() {
     }
 
     private static String trailingSlash(String path) {
-        return path.length() == 0 || path.charAt(path.length() - 1) != PATH_SEPARATOR
+        return path.isEmpty() || path.charAt(path.length() - 1) != PATH_SEPARATOR
                 ? PATH_SEPARATOR_STRING
                 : "";
     }
diff --git a/opengrok-web/src/main/webapp/diff.jsp b/opengrok-web/src/main/webapp/diff.jsp
index 19b232a9b3f..a2d9cc45c79 100644
--- a/opengrok-web/src/main/webapp/diff.jsp
+++ b/opengrok-web/src/main/webapp/diff.jsp
@@ -145,7 +145,7 @@ include file="/mast.jsp"
         int ln2 = 0;
         String rp1 = data.getParam(0);
         String rp2 = data.getParam(1);
-        String reqURI = request.getRequestURI();
+        String baseURL = request.getContextPath() + Prefix.DIFF_P + cfg.getUriEncodedPath();
         String[] file1 = data.getFile(0);
         String[] file2 = data.getFile(1);
 
@@ -169,7 +169,7 @@ include file="/mast.jsp"
                 }
             %></span><%
             } else {
-        %> <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
+        %> <span><a href="<%= baseURL %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
 <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
 <%= QueryParameters.FORMAT_PARAM_EQ %><%= t.getAbbrev() %>&amp;
 <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %><%= full ? '1' : '0'%>"><%= t.toString() %>
@@ -186,7 +186,7 @@ include file="/mast.jsp"
     <div class="ctype"><%
         if (!full) {
         %>
-        <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
+        <span><a href="<%= baseURL %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
 <%= QueryParameters.REVISION_2_PARAM_EQ %><%= Util.uriEncode(rp2) %>&amp;
 <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
 <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1">full</a></span>
@@ -194,13 +194,13 @@ include file="/mast.jsp"
         } else {
         %>
         <span class="active">full</span>
-        <span> <a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
+        <span> <a href="<%= baseURL %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
 <%= QueryParameters.REVISION_2_PARAM_EQ %><%= Util.uriEncode(rp2) %>&amp;
 <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
 <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>0">compact</a></span><%
         }
         %><span><a href="#" id="toggle-jumper">jumper</a></span>
-        <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
+        <span><a href="<%= baseURL %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
 <%= QueryParameters.REVISION_2_PARAM_EQ %><%= Util.uriEncode(rp2) %>&amp;
 <%= QueryParameters.FORMAT_PARAM_EQ %><%= DiffType.TEXT %>&amp;
 action=download">download diff</a></span><%
@@ -277,7 +277,7 @@ action=download">download diff</a></span><%
                     Util.htmlize(file2[j]) %><br/><%
                             }
                 %><br/>--- <strong><%= cn2 - ln2 - 16
-                    %> unchanged lines hidden</strong> (<a href="<%= reqURI
+                    %> unchanged lines hidden</strong> (<a href="<%= baseURL
 %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
 <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
 <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
@@ -341,7 +341,7 @@ action=download">download diff</a></span><%
                     Util.htmlize(file1[j]) %><br/><%
                             }
                 %><br/>--- <strong><%= cn1 - ln1 - 16
-                    %> unchanged lines hidden</strong> (<a href="<%= reqURI
+                    %> unchanged lines hidden</strong> (<a href="<%= baseURL
 %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
 <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
 <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
@@ -358,7 +358,7 @@ action=download">download diff</a></span><%
                     Util.htmlize(file2[j]) %><br/><%
                             }
                 %><br/>--- <strong><%= cn2 - ln2 - 16
-                    %> unchanged lines hidden</strong> (<a href="<%= reqURI
+                    %> unchanged lines hidden</strong> (<a href="<%= baseURL
 %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
 <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
 <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
@@ -400,7 +400,7 @@ action=download">download diff</a></span><%
             Util.htmlize(file1[j]) %><br/><%
                             }
         %><br/>--- <strong><%= cn1 - ln1 - 16
-            %> unchanged lines hidden</strong> (<a href="<%= reqURI
+            %> unchanged lines hidden</strong> (<a href="<%= baseURL
 %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
 <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
 <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
@@ -432,7 +432,7 @@ action=download">download diff</a></span><%
             Util.htmlize(file2[j]) %><br/><%
                             }
         %><br/>--- <strong><%= cn2 - ln2 - 16
-            %> unchanged lines hidden</strong> (<a href="<%= reqURI
+            %> unchanged lines hidden</strong> (<a href="<%= baseURL
 %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
 <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
 <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;