diff --git a/opengrok-web/src/main/java/org/opengrok/web/Scripts.java b/opengrok-web/src/main/java/org/opengrok/web/Scripts.java
index af3f0b58be0..9d4bd455225 100644
--- a/opengrok-web/src/main/java/org/opengrok/web/Scripts.java
+++ b/opengrok-web/src/main/java/org/opengrok/web/Scripts.java
@@ -29,9 +29,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableSet;
+import java.util.Optional;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import org.jetbrains.annotations.NotNull;
 import org.webjars.WebJarAssetLocator;
 
 /**
@@ -116,9 +118,9 @@ public String toHtml() {
         putFromWebJar("jquery", "3.6.4/jquery.min.js", 10);
         putjs("jquery-ui", "js/jquery-ui-1.12.1-custom", 11);
         putFromWebJar("jquery-tablesorter", "2.31.3/dist/js/jquery.tablesorter.min.js", 12);
-        putjs("tablesorter-parsers", "js/tablesorter-parsers-0.0.3", 13, true);
-        putjs("searchable-option-list", "js/searchable-option-list-2.0.15", 14, true);
-        putjs("utils", "js/utils-0.0.46", 15, true);
+        putjs("tablesorter-parsers", "js/tablesorter-parsers-0.0.4", 13, true);
+        putjs("searchable-option-list", "js/searchable-option-list-2.0.16", 14, true);
+        putjs("utils", "js/utils-0.0.47", 15, true);
         putjs("repos", "js/repos-0.0.3", 20, true);
         putjs("diff", "js/diff-0.0.5", 20, true);
         putjs("jquery-caret", "js/jquery.caret-1.5.2", 25);
@@ -203,7 +205,7 @@ public boolean isEmpty() {
      * @see List#iterator()
      */
     @Override
-    public Iterator<Script> iterator() {
+    public @NotNull Iterator<Script> iterator() {
         return outputScripts.iterator();
     }
 
@@ -216,7 +218,8 @@ public Iterator<Script> iterator() {
      * @return true if script was added; false otherwise
      */
     public boolean addScript(String contextPath, String scriptName, Type type) {
-        contextPath = contextPath == null || contextPath.isEmpty() ? "/" : contextPath + "/";
+        contextPath = Optional.ofNullable(contextPath)
+                .orElse("").concat("/");
         if (type == Type.DEBUG && SCRIPTS.containsKey(scriptName + DEBUG_SUFFIX)) {
             addScript(contextPath, scriptName + DEBUG_SUFFIX);
             return true;
diff --git a/opengrok-web/src/main/java/org/opengrok/web/StatisticsFilter.java b/opengrok-web/src/main/java/org/opengrok/web/StatisticsFilter.java
index dae7d0fcb04..14c7cc40346 100644
--- a/opengrok-web/src/main/java/org/opengrok/web/StatisticsFilter.java
+++ b/opengrok-web/src/main/java/org/opengrok/web/StatisticsFilter.java
@@ -45,6 +45,7 @@
 public class StatisticsFilter implements Filter {
 
     static final String REQUESTS_METRIC = "requests";
+    private static final String CATEGORY_TAG = "category";
 
     private final DistributionSummary requests = Metrics.getPrometheusRegistry().summary(REQUESTS_METRIC);
 
@@ -76,7 +77,7 @@ private void measure(HttpServletResponse httpResponse, HttpServletRequest httpRe
         category = getCategory(httpReq, config);
 
         Timer categoryTimer = Timer.builder("requests.latency").
-                tags("category", category, "code", String.valueOf(httpResponse.getStatus())).
+                tags(CATEGORY_TAG, category, "code", String.valueOf(httpResponse.getStatus())).
                 register(Metrics.getPrometheusRegistry());
         categoryTimer.record(duration);
 
@@ -85,12 +86,12 @@ private void measure(HttpServletResponse httpResponse, HttpServletRequest httpRe
         if (helper != null && registry != null) {
             if (helper.getHits() == null || helper.getHits().length == 0) {
                 Timer.builder("search.latency").
-                        tags("category", "ui", "outcome", "empty").
+                        tags(CATEGORY_TAG, "ui", "outcome", "empty").
                         register(registry).
                         record(duration);
             } else {
                 Timer.builder("search.latency").
-                        tags("category", "ui", "outcome", "success").
+                        tags(CATEGORY_TAG, "ui", "outcome", "success").
                         register(registry).
                         record(duration);
             }
diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java
index 034392f9e4b..ff22d2de767 100644
--- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java
+++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java
@@ -29,9 +29,11 @@
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.CompletableFuture;
@@ -74,8 +76,9 @@
 public class ProjectsController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ProjectsController.class);
+    private static final String NO_REPO_LOG_MSG = "no repositories found for project ''{0}''";
 
-    public static final String PROJECTS_PATH = "/projects";
+    public static final String PROJECTS_PATH = "projects";
 
     private final RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
@@ -131,19 +134,14 @@ private void addProjectWorkHorse(String projectName) {
                 List<RepositoryInfo> allrepos = env.getRepositories();
                 synchronized (allrepos) {
                     // newly added repository
-                    for (RepositoryInfo repo : repos) {
-                        if (!allrepos.contains(repo)) {
-                            allrepos.add(repo);
-                        }
-                    }
+                    repos.stream()
+                            .filter(repo -> !allrepos.contains(repo))
+                            .forEach(allrepos::add);
                     // deleted repository
-                    if (map.containsKey(project)) {
-                        for (RepositoryInfo repo : map.get(project)) {
-                            if (!repos.contains(repo)) {
-                                allrepos.remove(repo);
-                            }
-                        }
-                    }
+                    Optional.ofNullable(map.get(project))
+                            .stream().flatMap(Collection::stream)
+                            .filter(repo -> !repos.contains(repo))
+                            .forEach(allrepos::remove);
                 }
 
                 map.put(project, repos);
@@ -249,7 +247,7 @@ private void deleteProjectDataWorkHorse(Project project, boolean clearHistoryGur
 
         List<RepositoryInfo> repos = env.getProjectRepositoriesMap().get(project);
         if (repos == null || repos.isEmpty()) {
-            LOGGER.log(Level.INFO, "no repositories found for project ''{0}''", projectName);
+            LOGGER.log(Level.INFO, NO_REPO_LOG_MSG, projectName);
             return;
         }
 
@@ -274,7 +272,7 @@ public Response deleteAnnotationCache(@Context HttpServletRequest request,
         Project project = getProjectFromName(projectNameParam);
         List<RepositoryInfo> repos = env.getProjectRepositoriesMap().get(project);
         if (repos == null || repos.isEmpty()) {
-            LOGGER.log(Level.INFO, "no repositories found for project ''{0}''", project.getName());
+            LOGGER.log(Level.INFO, NO_REPO_LOG_MSG, project.getName());
             return null;
         }
 
@@ -307,7 +305,7 @@ public Response deleteHistoryCache(@Context HttpServletRequest request,
         Project project = getProjectFromName(projectNameParam);
         List<RepositoryInfo> repos = env.getProjectRepositoriesMap().get(project);
         if (repos == null || repos.isEmpty()) {
-            LOGGER.log(Level.INFO, "no repositories found for project ''{0}''", project.getName());
+            LOGGER.log(Level.INFO, NO_REPO_LOG_MSG, project.getName());
             return null;
         }
 
diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SuggesterController.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SuggesterController.java
index 1d928fde0d7..938834e2dc9 100644
--- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SuggesterController.java
+++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SuggesterController.java
@@ -221,7 +221,7 @@ public void addSearchCountsQueries(final List<String> urls) {
                     }
                 }
             } catch (MalformedURLException e) {
-                logger.log(Level.WARNING, "Could not add search counts for " + urlStr, e);
+                logger.log(Level.WARNING, e, () -> "Could not add search counts for " + urlStr);
             }
         }
     }
diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/filter/PathAuthorizationFilter.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/filter/PathAuthorizationFilter.java
index dc9506addd8..5618962860d 100644
--- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/filter/PathAuthorizationFilter.java
+++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/filter/PathAuthorizationFilter.java
@@ -84,7 +84,6 @@ public void filter(final ContainerRequestContext context) {
         if (!isPathAuthorized(path, request)) {
             // TODO: this should probably update statistics for denied requests like in AuthorizationFilter
             context.abortWith(Response.status(Response.Status.FORBIDDEN).build());
-            return; // for good measure
         }
     }
 }
diff --git a/opengrok-web/src/main/webapp/default/jquery.autocomplete.css b/opengrok-web/src/main/webapp/default/jquery.autocomplete.css
index f49bfb0051c..3bf0190e9b6 100644
--- a/opengrok-web/src/main/webapp/default/jquery.autocomplete.css
+++ b/opengrok-web/src/main/webapp/default/jquery.autocomplete.css
@@ -8,8 +8,8 @@
 
 .ac_results ul {
 	width: 100%;
-	list-style-position: outside;
 	list-style: none;
+	list-style-position: outside;
 	padding: 0;
 	margin: 0;
 }
diff --git a/opengrok-web/src/main/webapp/default/jquery.combo.css b/opengrok-web/src/main/webapp/default/jquery.combo.css
index fc1f4c0cf7c..4ad949a9f28 100644
--- a/opengrok-web/src/main/webapp/default/jquery.combo.css
+++ b/opengrok-web/src/main/webapp/default/jquery.combo.css
@@ -22,7 +22,6 @@
   cursor: pointer;
   height: 25px;
   width: 22px;
-  cursor: pointer;
 }
 
 .combo_td2 img {
diff --git a/opengrok-web/src/main/webapp/default/mandoc-1.0.0.css b/opengrok-web/src/main/webapp/default/mandoc-1.0.0.css
index 4cf4139d37f..2d7e38c1f1b 100644
--- a/opengrok-web/src/main/webapp/default/mandoc-1.0.0.css
+++ b/opengrok-web/src/main/webapp/default/mandoc-1.0.0.css
@@ -64,7 +64,6 @@ table.head {	width: 100%;
 td.head-vol {	text-align: center; }
 td.head-rtitle {
 		text-align: right; }
-span.Nd { }
 
 table.foot {	width: 100%;
 		border-top: 1px dotted #808080;
@@ -85,44 +84,30 @@ h2.Ss {		margin-top: 2ex;
 		margin-left: -2ex;
 		font-size: 105%; }
 div.Pp {	margin: 1ex 0ex; }
-a.Sx { }
-a.Xr { }
 
 /* Displays and lists. */
 
-div.Bd { }
 div.D1 {	margin-left: 5ex; }
 
 ul.Bl-bullet {	list-style-type: disc;
 		padding-left: 1em; }
-li.It-bullet { }
 ul.Bl-dash {	list-style-type: none;
 		padding-left: 0em; }
 li.It-dash:before {
 		content: "\2014  "; }
 ul.Bl-item {	list-style-type: none;
 		padding-left: 0em; }
-li.It-item { }
 ul.Bl-compact > li {
 		margin-top: 0ex; }
 
 ol.Bl-enum {	padding-left: 2em; }
-li.It-enum { }
 ol.Bl-compact > li {
 		margin-top: 0ex; }
 
-dl.Bl-diag { }
-dt.It-diag { }
 dd.It-diag {	margin-left: 0ex; }
 b.It-diag {	font-style: normal; }
-dl.Bl-hang { }
-dt.It-hang { }
 dd.It-hang {	margin-left: 10.2ex; }
-dl.Bl-inset { }
-dt.It-inset { }
 dd.It-inset {	margin-left: 0ex; }
-dl.Bl-ohang { }
-dt.It-ohang { }
 dd.It-ohang {	margin-left: 0ex; }
 dl.Bl-tag {	margin-left: 10.2ex; }
 dt.It-tag {	float: left;
@@ -139,41 +124,24 @@ dd.It-tag {	clear: right;
 dl.Bl-compact > dt {
 		margin-top: 0ex; }
 
-table.Bl-column { }
-tr.It-column { }
 td.It-column {	margin-top: 1em; }
 table.Bl-compact > tbody > tr > td {
 		margin-top: 0ex; }
 
 cite.Rs {	font-style: normal;
 		font-weight: normal; }
-span.RsA { }
 i.RsB {		font-weight: normal; }
-span.RsC { }
-span.RsD { }
 i.RsI {		font-weight: normal; }
 i.RsJ {		font-weight: normal; }
-span.RsN { }
-span.RsO { }
-span.RsP { }
-span.RsQ { }
-span.RsR { }
 span.RsT {	text-decoration: underline; }
-a.RsU { }
-span.RsV { }
-
-span.eqn { }
-table.tbl { }
 
 /* Semantic markup for command line utilities. */
 
-table.Nm { }
 b.Nm {		font-style: normal; }
 b.Fl {		font-style: normal; }
 b.Cm {		font-style: normal; }
 var.Ar {	font-style: italic;
 		font-weight: normal; }
-span.Op { }
 b.Ic {		font-style: normal; }
 code.Ev {	font-style: normal;
 		font-weight: normal;
@@ -182,9 +150,7 @@ i.Pa {		font-weight: normal; }
 
 /* Semantic markup for function libraries. */
 
-span.Lb { }
 b.In {		font-style: normal; }
-a.In { }
 b.Fd {		font-style: normal; }
 var.Ft {	font-style: italic;
 		font-weight: normal; }
@@ -204,14 +170,9 @@ code.Er {	font-style: normal;
 
 /* Various semantic markup. */
 
-span.An { }
-a.Lk { }
-a.Mt { }
 b.Cd {		font-style: normal; }
 i.Ad {		font-weight: normal; }
 b.Ms {		font-style: normal; }
-span.St { }
-a.Ux { }
 
 /* Physical markup. */
 
diff --git a/opengrok-web/src/main/webapp/default/print-1.0.2.css b/opengrok-web/src/main/webapp/default/print-1.0.2.css
index c37db045d72..8a5c6b557b3 100644
--- a/opengrok-web/src/main/webapp/default/print-1.0.2.css
+++ b/opengrok-web/src/main/webapp/default/print-1.0.2.css
@@ -77,8 +77,6 @@ label {
     display: block;
 }
 
-#page { }
-
 .error { /* error messages */
     color: #a52a2a;
 }
@@ -335,9 +333,6 @@ table#dirlist { /* the "Name" column */
 
 
 /* file display */
-#src {
-}
-
 #src pre {
     margin: 0;
     font-size: small;
@@ -422,9 +417,6 @@ a.xsr    { /* subroutine */         color: #00f; font-weight: bold;
 }
 
 /* search result page */
-#results {
-}
-
 #results p { /* pagetitle and slider */
     padding: 0.1em;
 }
diff --git a/opengrok-web/src/main/webapp/default/style-1.0.4.css b/opengrok-web/src/main/webapp/default/style-1.0.4.css
index dbf9462e4e8..ef388aa81a7 100644
--- a/opengrok-web/src/main/webapp/default/style-1.0.4.css
+++ b/opengrok-web/src/main/webapp/default/style-1.0.4.css
@@ -101,9 +101,6 @@ button:hover, button:active, .btn:hover, .btn:active {
     color: #ffffff;
 }
 
-label {
-}
-
 .pre { /* the diff content */
     white-space: pre-wrap;
     font-family: monospace;
@@ -115,8 +112,6 @@ label {
     display: block;
 }
 
-#page { }
-
 .error { /* error messages */
     color: #a52a2a;
 }
@@ -271,7 +266,6 @@ label {
 .version_color_10 { background-color: rgb( 255, 153, 38 ) !important; }
 
 /* ############### start of header ############## */
-#whole_header { }
 
 html.xref #whole_header,
 html.history #whole_header,
@@ -285,7 +279,6 @@ html.diff #whole_header {
 }
 
 /* *** banner/deco above navbar *** */
-#header { }
 
 #MastheadLogo {
     width: 171px;
@@ -368,6 +361,8 @@ html.diff #whole_header {
 }
 
 #qtbl {
+    display: inline-block;
+    vertical-align: top;
     float: left;
     width: 35%;
     min-width: 300px;
@@ -736,10 +731,6 @@ span.simplified-path {
     color: #888;
 }
 
-/* file display */
-div[id^='src'] {
-}
-
 div[id^='src'] pre {
     margin: 0;
 }
@@ -1008,8 +999,6 @@ a.scope            { /* scope              */ color: steelblue; font-weight: bol
 /**** DIFF NAVIGATION/JUMPER *****/
 
 /* search result page */
-#results {
-}
 
 #results p, #revisions p { /* pagetitle and slider */
     padding: 0.1em;
@@ -1028,9 +1017,6 @@ a.scope            { /* scope              */ color: steelblue; font-weight: bol
     padding-left: 1em;
 }
 
-#results .l {
-}
-
 #results td.q { /* 1st column: H A D */
     white-space: nowrap;
     font-size: xx-small;
@@ -1321,9 +1307,6 @@ h6.message-group-caption {
 .clearfix:after {
     content: " ";
     display: table;
-}
-
-.clearfix:after {
     clear: both;
 }
 
diff --git a/opengrok-web/src/main/webapp/diff.jsp b/opengrok-web/src/main/webapp/diff.jsp
index 27b26866b01..75a296a97bb 100644
--- a/opengrok-web/src/main/webapp/diff.jsp
+++ b/opengrok-web/src/main/webapp/diff.jsp
@@ -315,7 +315,7 @@ action=download">download diff</a></span><%
                         }
                 %><span class="a it"><%= ++ln2 %></span><%= file2[cl2] %><%
                         if(full) {
-                %><a name="<%= ln2 %>" /><%
+                %><a id="<%= ln2 %>" /><%
                         }
                 %></td>
             </tr><%
@@ -380,7 +380,7 @@ action=download">download diff</a></span><%
                     }
                 %></td><td><%
                     for (int j = cn2; j  <= cl2; j++) {
-                %><span class="it"><%= ++ln2 %></span><a name="<%= ln2 %>"></a><%=
+                %><span class="it"><%= ++ln2 %></span><a id="<%= ln2 %>"></a><%=
                     file2[j] %><br/><%
                     }
                 %></td>
@@ -416,7 +416,7 @@ action=download">download diff</a></span><%
         %><span class="it"><%= ++ln1 %></span><%= file1[j] %><br/><%
                     }
                     if (full) {
-        %><a name="<%=ln1%>" ></a><%
+        %><a id="<%=ln1%>" ></a><%
                     }
 // NEW
                 } else if (type == DiffType.NEW) {
@@ -448,7 +448,7 @@ action=download">download diff</a></span><%
         %><span class="it"><%= ++ln2 %></span><%= file2[j] %><br/><%
                     }
                     if (full) {
-        %><a name="<%= ln2 %>"></a><%
+        %><a id="<%= ln2 %>"></a><%
                     }
                 }
             } // else
diff --git a/opengrok-web/src/main/webapp/history.jsp b/opengrok-web/src/main/webapp/history.jsp
index 155ec4cd648..de58bdd577b 100644
--- a/opengrok-web/src/main/webapp/history.jsp
+++ b/opengrok-web/src/main/webapp/history.jsp
@@ -362,7 +362,7 @@ document.domReady.push(function() {domReadyHistory();});
                 %><%= Util.htmlize(author) %><%
                 }
                 %></td>
-            <td><a name="<%= dispRev %>"></a><%
+            <td><a id="<%= dispRev %>"></a><%
                 // revision message collapse threshold minimum of 10
                 int summaryLength = Math.max(10, cfg.getRevisionMessageCollapseThreshold());
                 String cout = Util.htmlize(entry.getMessage());
diff --git a/opengrok-web/src/main/webapp/js/searchable-option-list-2.0.15.js b/opengrok-web/src/main/webapp/js/searchable-option-list-2.0.16.js
similarity index 93%
rename from opengrok-web/src/main/webapp/js/searchable-option-list-2.0.15.js
rename to opengrok-web/src/main/webapp/js/searchable-option-list-2.0.16.js
index 617943e8b47..87b9f301ba4 100644
--- a/opengrok-web/src/main/webapp/js/searchable-option-list-2.0.15.js
+++ b/opengrok-web/src/main/webapp/js/searchable-option-list-2.0.16.js
@@ -22,7 +22,7 @@
     'use strict';
 
     // constructor
-    var SearchableOptionList = function ($element, options) {
+    let SearchableOptionList = function ($element, options) {
         this.$originalElement = $element;
         this.options = options;
 
@@ -41,6 +41,7 @@
             disabled: false,           // boolean disabled state
             label:    undefined,       // label string
             tooltip:  undefined,       // tooltip string
+            element : undefined,        // item element
             cssClass: ''               // custom css class for container
         },
         SOL_OPTIONGROUP_FORMAT: {
@@ -80,7 +81,7 @@
                 onChange: undefined,
                 onScroll: function () {
 
-                    var selectionContainerYPos = this.$input.offset().top - this.config.scrollTarget.scrollTop() + this.$input.outerHeight(false),
+                    let selectionContainerYPos = this.$input.offset().top - this.config.scrollTarget.scrollTop() + this.$input.outerHeight(false),
                         selectionContainerHeight = this.$selectionContainer.outerHeight(false),
                         selectionContainerBottom = selectionContainerYPos + selectionContainerHeight,
                         displayContainerAboveInput = this.config.displayContainerAboveInput || document.documentElement.clientHeight - this.config.scrollTarget.scrollTop() < selectionContainerBottom,
@@ -104,7 +105,7 @@
                         selectionContainerWidth = selectionContainerWidth * 1.2;
                     } else {
 
-                        var borderRadiusSelector = displayContainerAboveInput ? 'border-bottom-right-radius' : 'border-top-right-radius';
+                        let borderRadiusSelector = displayContainerAboveInput ? 'border-bottom-right-radius' : 'border-top-right-radius';
 
                         // no border radius on top
                         this.$selectionContainer
@@ -154,7 +155,7 @@
             this.valMap = null;
             this.config = $.extend(true, {}, this.defaults, this.options, this.metadata);
 
-            var originalName = this._getNameAttribute(),
+            let originalName = this._getNameAttribute(),
                 sol = this;
 
             if (!originalName) {
@@ -204,7 +205,7 @@
 
         // shows an error label
         _showErrorLabel: function (message) {
-            var $errorMessage = $('<div style="color: red; font-weight: bold;" />').html(message);
+            let $errorMessage = $('<div style="color: red; font-weight: bold;" />').html(message);
             if (!this.$container) {
                 $errorMessage.insertAfter(this.$originalElement);
             } else {
@@ -219,7 +220,7 @@
                     // if clicked inside a sol element close all others
                     // else close all sol containers
 
-                    var $clickedElement = $(event.target),
+                    let $clickedElement = $(event.target),
                         $closestSelectionContainer = $clickedElement.closest('.sol-selection-container'),
                         $closestInnerContainer = $clickedElement.closest('.sol-inner-container'),
                         $clickedWithinThisSolContainer;
@@ -246,7 +247,7 @@
 
         // add sol ui elements
         _initializeUiElements: function () {
-            var self = this;
+            let self = this;
 
             this.internalScrollWrapper = function () {
                 if ($.isFunction(self.config.events.onScroll)) {
@@ -267,7 +268,7 @@
                 return false;
             });
 
-            var $inputContainer = $('<div class="sol-input-container"/>').append(this.$input);
+            let $inputContainer = $('<div class="sol-input-container"/>').append(this.$input);
             this.$innerContainer = $('<div class="sol-inner-container"/>').append($inputContainer).append(this.$caret);
             this.$selection = $('<div class="sol-selection"/>');
             this.$selectionContainer = $('<div class="sol-selection-container"/>')
@@ -282,7 +283,7 @@
                  */
                 .keydown(function (e) {
                     if (e.keyCode == 13) {
-                        var concat = '';
+                        let concat = '';
                         $("#sbox #qtbl input[type='text']").each(function () {
                             concat += $.trim($(this).val());
                         });
@@ -292,7 +293,7 @@
                                 window.location = document.xrefPath + '/' + self.$input.val();
                                 return false;
                             }
-                            var $el = $(".keyboard-selection").first().find(".sol-checkbox")
+                            let $el = $(".keyboard-selection").first().find(".sol-checkbox")
                             // follow the actual project
                             if($el.length && $el.data('sol-item') &&
                                     $el.data('sol-item').label) {
@@ -323,7 +324,7 @@
             /*
              * Modified for OpenGrok in 2016.
              */
-            var $el = this.config.resultsContainer || this.$innerContainer
+            let $el = this.config.resultsContainer || this.$innerContainer
             if (this.config.resultsContainer) {
                 this.$showSelectionContainer.appendTo($el);
             } else {
@@ -340,7 +341,7 @@
             }
 
             // detect inline css classes and styles
-            var cssClassesAsString = this.$originalElement.attr('class'),
+            let cssClassesAsString = this.$originalElement.attr('class'),
                 cssStylesAsString = this.$originalElement.attr('style'),
                 cssClassList = [],
                 stylesList = [];
@@ -349,7 +350,7 @@
                 cssClassList = cssClassesAsString.split(/\s+/);
 
                 // apply css classes to $container
-                for (var i = 0; i < cssClassList.length; i++) {
+                for (let i = 0; i < cssClassList.length; i++) {
                     this.$container.addClass(cssClassList[i]);
                 }
             }
@@ -358,8 +359,8 @@
                 stylesList = cssStylesAsString.split(/\;/);
 
                 // apply css inline styles to $container
-                for (var i = 0; i < stylesList.length; i++) {
-                    var splitted = stylesList[i].split(/\s*\:\s*/g);
+                for (let i = 0; i < stylesList.length; i++) {
+                    let splitted = stylesList[i].split(/\s*\:\s*/g);
 
                     if (splitted.length === 2) {
 
@@ -384,7 +385,7 @@
 
         _getActualCssPropertyValue: function ($element, property) {
 
-            var domElement = $element.get(0),
+            let domElement = $element.get(0),
                 originalDisplayProperty = $element.css('display');
 
             // set invisible to get original width setting instead of translated to px
@@ -404,15 +405,15 @@
 
         _initializeInputEvents: function () {
             // form event
-            var self = this,
+            let self = this,
                 $form = this.$input.parents('form').first();
         
             if ($form && $form.length === 1 && !$form.data(this.WINDOW_EVENTS_KEY)) {
-                var resetFunction = function () {
-                    var $changedItems = [];
+                let resetFunction = function () {
+                    let $changedItems = [];
 
                     $form.find('.sol-option input').each(function (index, item) {
-                        var $item = $(item),
+                        let $item = $(item),
                             initialState = $item.data('sol-item').selected;
 
                         if ($item.prop('checked') !== initialState) {
@@ -454,7 +455,7 @@
                     self.open();
                 })
                 .on('propertychange input', function (e) {
-                    var valueChanged = true;
+                    let valueChanged = true;
                     if (e.type=='propertychange') {
                         valueChanged = e.originalEvent.propertyName.toLowerCase()=='value';
                     }
@@ -472,13 +473,13 @@
             // keyboard navigation
             this.$container
                 .on('keydown', function (e) {
-                    var keyCode = e.keyCode;
+                    let keyCode = e.keyCode;
 
                     // event handling for keyboard navigation
                     // only when there are results to be shown
                     if (!self.$noResultsItem.is(':visible')) {
 
-                        var $currentHighlightedOption,
+                        let $currentHighlightedOption,
                             $nextHighlightedOption,
                             directionValue,
                             preventDefault = false,
@@ -494,7 +495,7 @@
                             $currentHighlightedOption.find("input[type='checkbox']").blur();
                             directionValue = (keyCode === 38) ? -1 : 1;   // negative for up, positive for down
 
-                            var indexOfNextHighlightedOption = $allVisibleOptions.index($currentHighlightedOption) + directionValue;
+                            let indexOfNextHighlightedOption = $allVisibleOptions.index($currentHighlightedOption) + directionValue;
                             if (indexOfNextHighlightedOption < 0) {
                                 indexOfNextHighlightedOption = $allVisibleOptions.length - 1;
                             } else if (indexOfNextHighlightedOption >= $allVisibleOptions.length) {
@@ -509,10 +510,6 @@
                              */
                             $nextHighlightedOption.find("input[type='checkbox']").focus()
                             
-                            /*
-                             * Modified for OpenGrok in 2016.
-                             */
-                            //self.$selection.scrollTop(self.$selection.scrollTop() + $nextHighlightedOption.position().top);
 
                             preventDefault = true;
                         } else if (self.keyboardNavigationMode === true && keyCode === 32) {
@@ -533,7 +530,7 @@
                     }
                 })
                 .on('keyup', function (e) {
-                    var keyCode = e.keyCode;
+                    let keyCode = e.keyCode;
 
                     if (keyCode === 27) {
                         // escape key
@@ -575,7 +572,7 @@
                 return;
             }
 
-            var searchTerm = this.$input.val(),
+            let searchTerm = this.$input.val(),
                 lowerCased = (searchTerm || '').toLowerCase();
 
             // show previously filtered elements again
@@ -598,7 +595,7 @@
                 return;
             }
 
-            var self = this,
+            let self = this,
                     amountOfUnfilteredItems = dataArray.length
 
             // reset keyboard navigation mode when applying new filter
@@ -608,10 +605,10 @@
              * Modified for OpenGrok in 2016.
              * recursion was very slow (however good lookin')
              */
-            for (var itemIndex = 0; itemIndex < dataArray.length; itemIndex++) {
-                var item = dataArray[itemIndex];
+            for (let itemIndex = 0; itemIndex < dataArray.length; itemIndex++) {
+                let item = dataArray[itemIndex];
                 if (item.type === 'option') {
-                    var $element = item.displayElement,
+                    let $element = item.displayElement,
                             elementSearchableTerms = (item.label + ' ' + item.tooltip).trim().toLowerCase();
 
                     if (elementSearchableTerms.indexOf(searchTerm) === -1) {
@@ -619,11 +616,11 @@
                         amountOfUnfilteredItems--;
                     }
                 } else {
-                    var amountOfUnfilteredChildren = item.children.length
-                    for (var childrenIndex = 0; childrenIndex < item.children.length; childrenIndex++) {
-                        var child = item.children[childrenIndex];
+                    let amountOfUnfilteredChildren = item.children.length
+                    for (let childrenIndex = 0; childrenIndex < item.children.length; childrenIndex++) {
+                        let child = item.children[childrenIndex];
                         if (child.type === 'option') {
-                            var $element = child.displayElement,
+                            let $element = child.displayElement,
                                     elementSearchableTerms = (child.label + ' ' + child.tooltip).trim().toLowerCase();
 
                             if (elementSearchableTerms.indexOf(searchTerm) === -1) {
@@ -664,11 +661,11 @@
 
         _detectDataFromOriginalElement: function () {
             if (this.$originalElement.prop('tagName').toLowerCase() === 'select') {
-                var self = this,
+                let self = this,
                     solData = [];
 
                 $.each(this.$originalElement.children(), function (index, item) {
-                    var $item = $(item),
+                    let $item = $(item),
                         itemTagName = $item.prop('tagName').toLowerCase(),
                         solDataItem;
 
@@ -688,7 +685,7 @@
                 });
                 return this._invokeConverterIfNecessary(solData);
             } else if (this.$originalElement.data('sol-data')) {
-                var solDataAttributeValue = this.$originalElement.data('sol-data');
+                let solDataAttributeValue = this.$originalElement.data('sol-data');
                 return this._invokeConverterIfNecessary(solDataAttributeValue);
             } else {
                 this._showErrorLabel('Could not determine data from original element. Must be a select or data must be provided as data-sol-data="" attribute');
@@ -708,7 +705,7 @@
         },
 
         _processSelectOptgroup: function ($optgroup) {
-            var self = this,
+            let self = this,
                 solOptiongroup = $.extend({}, this.SOL_OPTIONGROUP_FORMAT, {
                     label: $optgroup.attr('label'),
                     tooltip: $optgroup.attr('title'),
@@ -718,7 +715,7 @@
                 optgroupChildren = $optgroup.children('option');
 
             $.each(optgroupChildren, function (index, item) {
-                var $child = $(item),
+                let $child = $(item),
                     solOption = self._processSelectOption($child);
 
                 // explicitly disable children when optgroup is disabled
@@ -741,7 +738,7 @@
         },
 
         _loadItemsFromUrl: function (url) {
-            var self = this;
+            let self = this;
             $.ajax(url, {
                 success: function (actualData) {
                     self.items = self._invokeConverterIfNecessary(actualData);
@@ -775,7 +772,7 @@
                 return;
             }
 
-            var self = this,
+            let self = this,
                 nextIndex = 0,
                 dataProcessedFunction = function () {
                     // hide "loading data"
@@ -788,7 +785,7 @@
                 },
                 loopFunction = function () {
 
-                    var currentBatch = 0,
+                    let currentBatch = 0,
                         item;
                     
                     while (currentBatch++ < self.config.asyncBatchSize && nextIndex < solItems.length) {
@@ -815,7 +812,7 @@
         },
 
         _renderOption: function (solOption, $optionalTargetContainer) {
-            var self = this,
+            let self = this,
                 $actualTargetContainer = $optionalTargetContainer || this.$selection,
                 $inputElement,
                 /*
@@ -830,11 +827,11 @@
             /*
              * Modified for OpenGrok in 2016, 2019.
              */
-            var data = $(solOption.element).data('messages');
-            var messagesLevel = $(solOption.element).data('messages-level');
-            var messagesAvailable = data && data.length;
+            let data = solOption.element.data('messages');
+            let messagesLevel = solOption.element.data('messages-level');
+            let messagesAvailable = data && data.length;
             if (messagesAvailable && messagesLevel) {
-                var cssString = 'pull-right ';
+                let cssString = 'pull-right ';
                 cssString += 'note-' + messagesLevel;
                 cssString += ' important-note important-note-rounded';
 
@@ -876,7 +873,7 @@
                     /*
                      * Modified for OpenGrok in 2016.
                      */
-                    var $closestOption = $(this).closest('.sol-option')
+                    let $closestOption = $(this).closest('.sol-option')
                     self._setKeyBoardNavigationMode(true)
                     self.$selection
                             .find('.sol-option.keyboard-selection')
@@ -901,7 +898,7 @@
              * Modified for OpenGrok in 2016.
              */
             $displayElement = $('<div class="sol-option"/>').dblclick(function (e) {
-                var $el = $(this).find('.sol-checkbox');
+                let $el = $(this).find('.sol-checkbox');
                 if ($el.length && $el.data('sol-item') && $el.data('sol-item').label) {
                     // go first project
                     window.location = document.xrefPath + '/' + $(this).find('.sol-checkbox').data('sol-item').label;
@@ -925,7 +922,7 @@
         },
 
         _renderOptiongroup: function (solOptiongroup) {
-            var self = this,
+            let self = this,
                 $groupCaption = $('<div class="sol-optiongroup-label"/>')
                     .attr('title', solOptiongroup.tooltip)
                     .html(solOptiongroup.label),
@@ -967,7 +964,7 @@
             // multiple values selectable
             if (this.config.showSelectAll === true || ($.isFunction(this.config.showSelectAll) && this.config.showSelectAll.call(this))) {
                 // buttons for (de-)select all
-                var self = this,
+                let self = this,
                     $deselectAllButton = $('<a href="#" class="sol-deselect-all"/>').html(this.config.texts.selectNone).click(function (e) {
                         self.deselectAll();
                         e.preventDefault();
@@ -991,10 +988,10 @@
             // on retrieving the value via jQuery option selectors
             // e.g. $('#myPreviousSelectWhichNowIsSol').val()
             if (this.$originalElement && this.$originalElement.prop('tagName').toLowerCase() === 'select') {
-                var self = this;
+                let self = this;
                 if (this.valMap == null) {
                     this.$originalElement.find('option').each(function (index, item) {
-                        var $currentOriginalOption = $(item);
+                        let $currentOriginalOption = $(item);
                         if ($currentOriginalOption.val() === $changeItem.val()) {
                             $currentOriginalOption.prop('selected', $changeItem.prop('checked'));
                             self.$originalElement.trigger('change');
@@ -1002,7 +999,7 @@
                         }
                     });
                 } else {
-                    var mappedVal = this.valMap.get($changeItem.val());
+                    let mappedVal = this.valMap.get($changeItem.val());
                     if (mappedVal) {
                         mappedVal.prop('selected', $changeItem.prop('checked'));
                         self.$originalElement.trigger('change');
@@ -1033,7 +1030,7 @@
 
         _setXItemsSelected: function() {
             if (this.config.maxShow !== 0 && this.numSelected > this.config.maxShow) {
-                var xItemsText = this.config.texts.itemsSelected.replace('{$a}',
+                let xItemsText = this.config.texts.itemsSelected.replace('{$a}',
                     this.numSelected - this.config.maxShow);
                 this.$xItemsSelected.html('<div class="sol-selected-display-item-text">' +
                     xItemsText + '<div>');
@@ -1060,7 +1057,7 @@
         },
 
         _buildSelectionDisplayItem: function ($changedItem) {
-            var solOptionItem = $changedItem.data('sol-item'),
+            let solOptionItem = $changedItem.data('sol-item'),
                 self = this,
                 $existingDisplayItem,
                 $displayItemText;
@@ -1068,7 +1065,7 @@
             /*
              * Modified for OpenGrok in 2016, 2019.
              */
-            var label = solOptionItem.label;
+            let label = solOptionItem.label;
             if ($changedItem.data('messages-available')) {
                 label += ' <span class="';
                 label += 'note-' + $changedItem.data('messages-level');
@@ -1115,10 +1112,10 @@
         },
 
         _removeSelectionDisplayItem: function ($changedItem) {
-            var solOptionItem = $changedItem.data('sol-item'),
+            let solOptionItem = $changedItem.data('sol-item'),
                 $myDisplayItem = solOptionItem.displaySelectionItem;
 
-            var wasExceeding = this.config.maxShow !== 0 && this.numSelected > this.config.maxShow;
+            let wasExceeding = this.config.maxShow !== 0 && this.numSelected > this.config.maxShow;
             this.numSelected = this.numSelected - 1;
             if (this.config.numSelectedItem) {
                 this.config.numSelectedItem.val(this.numSelected);
@@ -1139,11 +1136,11 @@
                  */
 
                 if (wasExceeding && this.valMap == null) {
-                    var self = this;
+                    let self = this;
                     this.$selectionContainer
                         .find('.sol-option input[type="checkbox"]:not([disabled]):checked')
                         .each(function (index, item) {
-                            var $currentOptionItem = $(item);
+                            let $currentOptionItem = $(item);
                             if ($currentOptionItem.data('sol-item').displaySelectionItem == null) {
                                 self._buildSelectionDisplayItem($currentOptionItem);
                                 return false;
@@ -1176,10 +1173,10 @@
 
         _buildValMap: function () {
             if (this.$originalElement && this.$originalElement.prop('tagName').toLowerCase() === 'select') {
-                var self = this;
+                let self = this;
                 this.valMap = new Map();
                 this.$originalElement.find('option').each(function (index, item) {
-                    var $currentOriginalOption = $(item);
+                    let $currentOriginalOption = $(item);
                     self.valMap.set($currentOriginalOption.val(), $currentOriginalOption);
                 });
             }
@@ -1241,7 +1238,7 @@
             if (this.config.multiple) {
                 this._buildValMap();
 
-                var $changedInputs = !optgroup ? this.$selectionContainer
+                let $changedInputs = !optgroup ? this.$selectionContainer
                         : this.$selectionContainer
                         .find(".sol-optiongroup-label")
                         .filter(function () {
@@ -1269,9 +1266,9 @@
             if (this.config.multiple) {
                 this._buildValMap();
 
-                var $closedInputs = this.$selectionContainer
+                let $closedInputs = this.$selectionContainer
                     .find('input[type="checkbox"][name=project]:not([disabled], :checked)')
-                var $openedInputs = this.$selectionContainer
+                let $openedInputs = this.$selectionContainer
                     .find('input[type="checkbox"][name=project]').filter('[disabled], :checked')
 
                 $openedInputs.prop('checked', false)
@@ -1296,7 +1293,7 @@
             if (this.config.multiple) {
                 this._buildValMap();
 
-                var $changedInputs = !optgroup ? this.$selectionContainer
+                let $changedInputs = !optgroup ? this.$selectionContainer
                         : this.$selectionContainer
                         .find(".sol-optiongroup-label")
                         .filter(function () {
@@ -1321,7 +1318,7 @@
         selectRadio: function(val) {
             this.$selectionContainer.find('input[type="radio"]')
                 .each(function (index, item) {
-                    var $currentOptionItem = $(item);
+                    let $currentOptionItem = $(item);
                     if ($currentOptionItem.val() === val) {
                         if (!$currentOptionItem.is(':checked')) {
                             $currentOptionItem.prop("checked", true).trigger('change', true);
@@ -1341,15 +1338,15 @@
     window.SearchableOptionList = SearchableOptionList;
 
     $.fn.searchableOptionList = function (options) {
-        var result = [];
+        let result = [];
         this.each(function () {
-            var $this = $(this),
+            let $this = $(this),
                 $alreadyInitializedSol = $this.data(SearchableOptionList.prototype.DATA_KEY);
 
             if ($alreadyInitializedSol) {
                 result.push($alreadyInitializedSol);
             } else {
-                var newSol = new SearchableOptionList($this, options);
+                let newSol = new SearchableOptionList($this, options);
                 result.push(newSol);
 
                 setTimeout(function() {
diff --git a/opengrok-web/src/main/webapp/js/tablesorter-parsers-0.0.3.js b/opengrok-web/src/main/webapp/js/tablesorter-parsers-0.0.4.js
similarity index 97%
rename from opengrok-web/src/main/webapp/js/tablesorter-parsers-0.0.3.js
rename to opengrok-web/src/main/webapp/js/tablesorter-parsers-0.0.4.js
index 748be0bc7b3..f30c3a6e252 100644
--- a/opengrok-web/src/main/webapp/js/tablesorter-parsers-0.0.3.js
+++ b/opengrok-web/src/main/webapp/js/tablesorter-parsers-0.0.4.js
@@ -27,7 +27,7 @@ $.tablesorter.addParser({
         return false;
     },
     format: function (s) {
-        const date = s.match(/^(\d{2})\-(\w{3})\-(\d{4})$/);
+        const date = s.match(/^(\d{2})-(\w{3})-(\d{4})$/);
         if (!date) {
             return new Date().getTime();
         }
diff --git a/opengrok-web/src/main/webapp/js/utils-0.0.46.js b/opengrok-web/src/main/webapp/js/utils-0.0.47.js
similarity index 99%
rename from opengrok-web/src/main/webapp/js/utils-0.0.46.js
rename to opengrok-web/src/main/webapp/js/utils-0.0.47.js
index f014fec2b84..1a24843194e 100644
--- a/opengrok-web/src/main/webapp/js/utils-0.0.46.js
+++ b/opengrok-web/src/main/webapp/js/utils-0.0.47.js
@@ -1493,8 +1493,8 @@ function init_markdown_converter() {
     let converter = null;
     $('[data-markdown]').each(function () {
         var $that = $(this);
-        $.script.loadScript('webjars/xss/1.0.8/dist/xss.min.js').done(function () {
-            $.script.loadScript('webjars/showdown/1.9.1/dist/showdown.min.js').done(function () {
+        $.script.loadScript('webjars/xss/1.0.10/dist/xss.min.js').done(function () {
+            $.script.loadScript('webjars/showdown/2.1.0/dist/showdown.min.js').done(function () {
                 $that.find('.markdown-content[data-markdown-download]').each(function () {
                     var $dataMarkdownDownloadEl = $(this);
                     if (converter === null) {