diff --git a/handlers/api-get/milestoneICS.ts b/handlers/api-get/milestoneICS.ts
index cdf033b7..539deb05 100644
--- a/handlers/api-get/milestoneICS.ts
+++ b/handlers/api-get/milestoneICS.ts
@@ -27,6 +27,10 @@ export const handler: RequestHandler = (request, response) => {
             : ":" + configFunctions.getProperty("application.httpPort")) +
         configFunctions.getProperty("reverseProxy.urlPrefix");
 
+    /*
+     * Get work order milestones
+     */
+
     const workOrderMilestoneFilters: WorkOrderMilestoneFilters = {
         workOrderTypeIds: request.query.workOrderTypeIds as string,
         workOrderMilestoneTypeIds: request.query.workOrderMilestoneTypeIds as string
@@ -43,6 +47,10 @@ export const handler: RequestHandler = (request, response) => {
         orderBy: "date"
     });
 
+    /*
+     * Create calendar object
+     */
+
     const calendar = ical({
         name: "Work Order Milestone Calendar",
         url: urlRoot + "/workOrders"
@@ -58,6 +66,10 @@ export const handler: RequestHandler = (request, response) => {
         product: configFunctions.getProperty("application.applicationName")
     });
 
+    /*
+     * Loop through milestones
+     */
+
     for (const milestone of workOrderMilestones) {
         const milestoneTimePieces = (
             milestone.workOrderMilestoneDateString +
diff --git a/public-scss/style.scss b/public-scss/style.scss
index 0e6164dd..50fa950d 100644
--- a/public-scss/style.scss
+++ b/public-scss/style.scss
@@ -185,8 +185,8 @@ span.button.is-static {
         margin-right: 0.25rem;
         margin-top: 0.15rem;
     }
-} 
+}
 
 .datetimepicker.is-active {
     z-index: 10;
-}
\ No newline at end of file
+}
diff --git a/public-typescript/lotOccupancySearch.js b/public-typescript/lotOccupancySearch.js
index 080aeab5..26f13304 100644
--- a/public-typescript/lotOccupancySearch.js
+++ b/public-typescript/lotOccupancySearch.js
@@ -84,18 +84,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         "</td>") +
                     ("<td>" +
                         (lotOccupancy.lotName
-                            ? '<span class="has-tooltip-right" data-tooltip="' +
+                            ? '<a class="has-tooltip-right" data-tooltip="' +
                                 cityssm.escapeHTML(lotOccupancy.lotType) +
+                                '" href="' +
+                                urlPrefix +
+                                "/lots/" +
+                                lotOccupancy.lotId +
                                 '">' +
                                 cityssm.escapeHTML(lotOccupancy.lotName) +
-                                "</span>"
+                                "</a>"
                             : '<span class="has-text-grey">(No ' +
                                 cityssm.escapeHTML(exports.aliases.lot) +
                                 ")</span>") +
                         "<br />" +
-                        '<span class="is-size-7">' +
-                        cityssm.escapeHTML(lotOccupancy.mapName || "") +
-                        "</span>" +
+                        ('<span class="is-size-7">' +
+                            cityssm.escapeHTML(lotOccupancy.mapName || "") +
+                            "</span>") +
                         "</td>") +
                     ("<td>" + lotOccupancy.occupancyStartDateString + "</td>") +
                     ("<td>" +
@@ -103,9 +107,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                             ? lotOccupancy.occupancyEndDateString
                             : '<span class="has-text-grey">(No End Date)</span>') +
                         "</td>") +
-                    "<td>" +
-                    occupantsHTML +
-                    "</td>" +
+                    ("<td>" + occupantsHTML + "</td>") +
                     (lotOccupancyPrints.length > 0
                         ? "<td>" +
                             '<a class="button is-small" data-tooltip="Print" href="' +
@@ -127,12 +129,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     '<th class="has-width-1"></th>' +
                     ("<th>" + cityssm.escapeHTML(exports.aliases.occupancy) + " Type</th>") +
                     ("<th>" + cityssm.escapeHTML(exports.aliases.lot) + "</th>") +
-                    "<th>" +
-                    cityssm.escapeHTML(exports.aliases.occupancyStartDate) +
-                    "</th>" +
+                    ("<th>" + cityssm.escapeHTML(exports.aliases.occupancyStartDate) + "</th>") +
                     "<th>End Date</th>" +
                     ("<th>" + cityssm.escapeHTML(exports.aliases.occupants) + "</th>") +
-                    (lotOccupancyPrints.length > 0 ? '<th class="has-width-1"></th>' : "") +
+                    (lotOccupancyPrints.length > 0 ? '<th class="has-width-1"><span class="is-sr-only">Print</span></th>' : "") +
                     "</tr></thead>" +
                     "<table>" +
                     '<div class="level">' +
diff --git a/public-typescript/lotOccupancySearch.ts b/public-typescript/lotOccupancySearch.ts
index a677e5ef..0cfc62a6 100644
--- a/public-typescript/lotOccupancySearch.ts
+++ b/public-typescript/lotOccupancySearch.ts
@@ -117,18 +117,22 @@ declare const cityssm: cityssmGlobal;
                                 "</td>") +
                             ("<td>" +
                                 (lotOccupancy.lotName
-                                    ? '<span class="has-tooltip-right" data-tooltip="' +
+                                    ? '<a class="has-tooltip-right" data-tooltip="' +
                                       cityssm.escapeHTML(lotOccupancy.lotType) +
+                                      '" href="' +
+                                      urlPrefix +
+                                      "/lots/" +
+                                      lotOccupancy.lotId +
                                       '">' +
                                       cityssm.escapeHTML(lotOccupancy.lotName) +
-                                      "</span>"
+                                      "</a>"
                                     : '<span class="has-text-grey">(No ' +
                                       cityssm.escapeHTML(exports.aliases.lot) +
                                       ")</span>") +
                                 "<br />" +
-                                '<span class="is-size-7">' +
-                                cityssm.escapeHTML(lotOccupancy.mapName || "") +
-                                "</span>" +
+                                ('<span class="is-size-7">' +
+                                    cityssm.escapeHTML(lotOccupancy.mapName || "") +
+                                    "</span>") +
                                 "</td>") +
                             ("<td>" + lotOccupancy.occupancyStartDateString + "</td>") +
                             ("<td>" +
@@ -136,9 +140,7 @@ declare const cityssm: cityssmGlobal;
                                     ? lotOccupancy.occupancyEndDateString
                                     : '<span class="has-text-grey">(No End Date)</span>') +
                                 "</td>") +
-                            "<td>" +
-                            occupantsHTML +
-                            "</td>" +
+                            ("<td>" + occupantsHTML + "</td>") +
                             (lotOccupancyPrints.length > 0
                                 ? "<td>" +
                                   '<a class="button is-small" data-tooltip="Print" href="' +
@@ -162,12 +164,10 @@ declare const cityssm: cityssmGlobal;
                     '<th class="has-width-1"></th>' +
                     ("<th>" + cityssm.escapeHTML(exports.aliases.occupancy) + " Type</th>") +
                     ("<th>" + cityssm.escapeHTML(exports.aliases.lot) + "</th>") +
-                    "<th>" +
-                    cityssm.escapeHTML(exports.aliases.occupancyStartDate) +
-                    "</th>" +
+                    ("<th>" + cityssm.escapeHTML(exports.aliases.occupancyStartDate) + "</th>") +
                     "<th>End Date</th>" +
                     ("<th>" + cityssm.escapeHTML(exports.aliases.occupants) + "</th>") +
-                    (lotOccupancyPrints.length > 0 ? '<th class="has-width-1"></th>' : "") +
+                    (lotOccupancyPrints.length > 0 ? '<th class="has-width-1"><span class="is-sr-only">Print</span></th>' : "") +
                     "</tr></thead>" +
                     "<table>" +
                     '<div class="level">' +
diff --git a/public/javascripts/lotOccupancySearch.min.js b/public/javascripts/lotOccupancySearch.min.js
index b9f42812..61609b25 100644
--- a/public/javascripts/lotOccupancySearch.min.js
+++ b/public/javascripts/lotOccupancySearch.min.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const t=document.querySelector("main").dataset.urlPrefix,a=exports.lotOccupancyPrints,e=document.querySelector("#form--searchFilters"),s=document.querySelector("#container--searchResults"),c=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),i=document.querySelector("#searchFilter--offset"),n=()=>{const n=Number.parseInt(i.value,10);s.innerHTML='<div class="has-text-grey has-text-centered"><i class="fas fa-5x fa-circle-notch fa-spin" aria-hidden="true"></i><br />Loading '+exports.aliases.occupancies+"...</div>",cityssm.postJSON(t+"/lotOccupancies/doSearchLotOccupancies",e,e=>{if(0===e.lotOccupancies.length)return void(s.innerHTML='<div class="message is-info"><p class="message-body">There are no '+cityssm.escapeHTML(exports.aliases.occupancy.toLowerCase())+" records that meet the search criteria.</p></div>");const i=document.createElement("tbody"),o=cityssm.dateToString(new Date);for(const s of e.lotOccupancies){let e="";e=s.occupancyStartDateString<=o&&(""===s.occupancyEndDateString||s.occupancyEndDateString>=o)?'<span class="has-tooltip-right" data-tooltip="Current '+exports.aliases.occupancy+'"><i class="fas fa-play" aria-label="Current '+exports.aliases.occupancy+'"></i></span>':s.occupancyStartDateString>o?'<span class="has-tooltip-right" data-tooltip="Future '+exports.aliases.occupancy+'"><i class="fas fa-fast-forward" aria-label="Future '+exports.aliases.occupancy+'"></i></span>':'<span class="has-tooltip-right" data-tooltip="Past '+exports.aliases.occupancy+'"><i class="fas fa-stop" aria-label="Past '+exports.aliases.occupancy+'"></i></span>';let c="";for(const t of s.lotOccupancyOccupants)c+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(t.lotOccupantType)+'">'+cityssm.escapeHTML(t.occupantName)+"</span><br />";i.insertAdjacentHTML("beforeend",'<tr><td class="has-width-1">'+e+'</td><td><a class="has-text-weight-bold" href="'+t+"/lotOccupancies/"+s.lotOccupancyId+'">'+cityssm.escapeHTML(s.occupancyType)+"</a></td><td>"+(s.lotName?'<span class="has-tooltip-right" data-tooltip="'+cityssm.escapeHTML(s.lotType)+'">'+cityssm.escapeHTML(s.lotName)+"</span>":'<span class="has-text-grey">(No '+cityssm.escapeHTML(exports.aliases.lot)+")</span>")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(s.mapName||"")+"</span></td><td>"+s.occupancyStartDateString+"</td><td>"+(s.occupancyEndDate?s.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+c+"</td>"+(a.length>0?'<td><a class="button is-small" data-tooltip="Print" href="'+t+"/print/"+a[0]+"/?lotOccupancyId="+s.lotOccupancyId+'" target="_blank"><i class="fas fa-print" aria-label="Print"></i></a></td>':"")+"</tr>")}s.innerHTML='<table class="table is-fullwidth is-striped is-hoverable has-sticky-header"><thead><tr><th class="has-width-1"></th><th>'+cityssm.escapeHTML(exports.aliases.occupancy)+" Type</th><th>"+cityssm.escapeHTML(exports.aliases.lot)+"</th><th>"+cityssm.escapeHTML(exports.aliases.occupancyStartDate)+"</th><th>End Date</th><th>"+cityssm.escapeHTML(exports.aliases.occupants)+"</th>"+(a.length>0?'<th class="has-width-1"></th>':"")+'</tr></thead><table><div class="level"><div class="level-left"><div class="level-item has-text-weight-bold">Displaying '+(n+1).toString()+" to "+Math.min(e.count,c+n)+" of "+e.count+'</div></div><div class="level-right">'+(n>0?'<div class="level-item"><button class="button is-rounded is-link is-outlined" data-page="previous" type="button" title="Previous"><i class="fas fa-arrow-left" aria-hidden="true"></i></button></div>':"")+(c+n<e.count?'<div class="level-item"><button class="button is-rounded is-link" data-page="next" type="button" title="Next"><span>Next</span><span class="icon"><i class="fas fa-arrow-right" aria-hidden="true"></i></span></button></div>':"")+"</div></div>",s.querySelector("table").append(i),n>0&&s.querySelector("button[data-page='previous']").addEventListener("click",l),c+n<e.count&&s.querySelector("button[data-page='next']").addEventListener("click",r)})},o=()=>{i.value="0",n()},l=()=>{i.value=Math.max(Number.parseInt(i.value,10)-c,0).toString(),n()},r=()=>{i.value=(Number.parseInt(i.value,10)+c).toString(),n()},p=e.querySelectorAll("input, select");for(const t of p)t.addEventListener("change",o);e.addEventListener("submit",t=>{t.preventDefault(),o()}),n()})();
\ No newline at end of file
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const t=document.querySelector("main").dataset.urlPrefix,a=exports.lotOccupancyPrints,e=document.querySelector("#form--searchFilters"),s=document.querySelector("#container--searchResults"),c=Number.parseInt(document.querySelector("#searchFilter--limit").value,10),i=document.querySelector("#searchFilter--offset"),n=()=>{const n=Number.parseInt(i.value,10);s.innerHTML='<div class="has-text-grey has-text-centered"><i class="fas fa-5x fa-circle-notch fa-spin" aria-hidden="true"></i><br />Loading '+exports.aliases.occupancies+"...</div>",cityssm.postJSON(t+"/lotOccupancies/doSearchLotOccupancies",e,e=>{if(0===e.lotOccupancies.length)return void(s.innerHTML='<div class="message is-info"><p class="message-body">There are no '+cityssm.escapeHTML(exports.aliases.occupancy.toLowerCase())+" records that meet the search criteria.</p></div>");const i=document.createElement("tbody"),o=cityssm.dateToString(new Date);for(const s of e.lotOccupancies){let e="";e=s.occupancyStartDateString<=o&&(""===s.occupancyEndDateString||s.occupancyEndDateString>=o)?'<span class="has-tooltip-right" data-tooltip="Current '+exports.aliases.occupancy+'"><i class="fas fa-play" aria-label="Current '+exports.aliases.occupancy+'"></i></span>':s.occupancyStartDateString>o?'<span class="has-tooltip-right" data-tooltip="Future '+exports.aliases.occupancy+'"><i class="fas fa-fast-forward" aria-label="Future '+exports.aliases.occupancy+'"></i></span>':'<span class="has-tooltip-right" data-tooltip="Past '+exports.aliases.occupancy+'"><i class="fas fa-stop" aria-label="Past '+exports.aliases.occupancy+'"></i></span>';let c="";for(const t of s.lotOccupancyOccupants)c+='<span class="has-tooltip-left" data-tooltip="'+cityssm.escapeHTML(t.lotOccupantType)+'">'+cityssm.escapeHTML(t.occupantName)+"</span><br />";i.insertAdjacentHTML("beforeend",'<tr><td class="has-width-1">'+e+'</td><td><a class="has-text-weight-bold" href="'+t+"/lotOccupancies/"+s.lotOccupancyId+'">'+cityssm.escapeHTML(s.occupancyType)+"</a></td><td>"+(s.lotName?'<a class="has-tooltip-right" data-tooltip="'+cityssm.escapeHTML(s.lotType)+'" href="'+t+"/lots/"+s.lotId+'">'+cityssm.escapeHTML(s.lotName)+"</a>":'<span class="has-text-grey">(No '+cityssm.escapeHTML(exports.aliases.lot)+")</span>")+'<br /><span class="is-size-7">'+cityssm.escapeHTML(s.mapName||"")+"</span></td><td>"+s.occupancyStartDateString+"</td><td>"+(s.occupancyEndDate?s.occupancyEndDateString:'<span class="has-text-grey">(No End Date)</span>')+"</td><td>"+c+"</td>"+(a.length>0?'<td><a class="button is-small" data-tooltip="Print" href="'+t+"/print/"+a[0]+"/?lotOccupancyId="+s.lotOccupancyId+'" target="_blank"><i class="fas fa-print" aria-label="Print"></i></a></td>':"")+"</tr>")}s.innerHTML='<table class="table is-fullwidth is-striped is-hoverable has-sticky-header"><thead><tr><th class="has-width-1"></th><th>'+cityssm.escapeHTML(exports.aliases.occupancy)+" Type</th><th>"+cityssm.escapeHTML(exports.aliases.lot)+"</th><th>"+cityssm.escapeHTML(exports.aliases.occupancyStartDate)+"</th><th>End Date</th><th>"+cityssm.escapeHTML(exports.aliases.occupants)+"</th>"+(a.length>0?'<th class="has-width-1"><span class="is-sr-only">Print</span></th>':"")+'</tr></thead><table><div class="level"><div class="level-left"><div class="level-item has-text-weight-bold">Displaying '+(n+1).toString()+" to "+Math.min(e.count,c+n)+" of "+e.count+'</div></div><div class="level-right">'+(n>0?'<div class="level-item"><button class="button is-rounded is-link is-outlined" data-page="previous" type="button" title="Previous"><i class="fas fa-arrow-left" aria-hidden="true"></i></button></div>':"")+(c+n<e.count?'<div class="level-item"><button class="button is-rounded is-link" data-page="next" type="button" title="Next"><span>Next</span><span class="icon"><i class="fas fa-arrow-right" aria-hidden="true"></i></span></button></div>':"")+"</div></div>",s.querySelector("table").append(i),n>0&&s.querySelector("button[data-page='previous']").addEventListener("click",l),c+n<e.count&&s.querySelector("button[data-page='next']").addEventListener("click",r)})},o=()=>{i.value="0",n()},l=()=>{i.value=Math.max(Number.parseInt(i.value,10)-c,0).toString(),n()},r=()=>{i.value=(Number.parseInt(i.value,10)+c).toString(),n()},p=e.querySelectorAll("input, select");for(const t of p)t.addEventListener("change",o);e.addEventListener("submit",t=>{t.preventDefault(),o()}),n()})();
\ No newline at end of file