diff --git a/src/static/script.js b/src/static/script.js
index b443b804..eeaaaeb0 100644
--- a/src/static/script.js
+++ b/src/static/script.js
@@ -372,7 +372,7 @@ function updateProfileWidgets() {
       ["completionist", "Completionist"],
       ["roadmap_runner", "Roadmap Runner"]
     ];
-    badgesEl.innerHTML = badges.map(function (badge) {
+    badgesEl.innerHTML = (badges ?? []).map(function (badge) {
       var unlocked = progress.badges[badge[0]];
       return "<li class=\"progress-badge " + (unlocked ? "progress-badge--unlocked" : "progress-badge--locked") +
         "\"><span class=\"badge-icon\">" + (unlocked ? "OK" : "*") + "</span><span>" + badge[1] + "</span></li>";
@@ -629,7 +629,7 @@ async function updatePortfolioAnalysis() {
     var q = normalize(query);
     if (!q) return [];
     return availableSkills.filter(function (skill) {
-      return normalize(skill).indexOf(q) !== -1 && !isSelected(skill);
+      return normalize(skill).includes(q) && !isSelected(skill);
     }).slice(0, 8);
   }