diff --git a/src/lib/components/MaintenancePopup.js b/src/lib/components/MaintenancePopup.js
index e2fc070..3f17a03 100644
--- a/src/lib/components/MaintenancePopup.js
+++ b/src/lib/components/MaintenancePopup.js
@@ -13,7 +13,7 @@ export class MaintenancePopup extends BaseComponent {
   /** @type {MaintenanceProfile|null} */
   #activeProfile = null;
 
-  /** @type {import('$lib/components/MediaBoxToolsEvents.js').MediaBoxTools|null} */
+  /** @type {import('$lib/components/MediaBoxToolsEvents.js').MediaBoxTools} */
   #mediaBoxTools = null;
 
   /**
@@ -73,26 +73,21 @@ export class MaintenancePopup extends BaseComponent {
 
     this.#tagsList = new Array(activeProfileTagsList.length);
 
+    const currentPostTags = this.#mediaBoxTools.mediaBox.tagsAndAliases;
+
     activeProfileTagsList
       .sort((a, b) => a.localeCompare(b))
       .forEach((tagName, index) => {
         const tagElement = MaintenancePopup.#buildTagElement(tagName);
         this.#tagsList[index] = tagElement;
         this.#tagsListElement.appendChild(tagElement);
-      });
 
-    if (this.#mediaBoxTools) {
-      const tagsAndAliases = this.#mediaBoxTools.mediaBox.tagsAndAliases;
-
-      for (let tagElement of this.#tagsList) {
-        const tagName = tagElement.dataset.name;
-        const isPresent = tagsAndAliases.has(tagName);
+        const isPresent = currentPostTags.has(tagName);
 
         tagElement.classList.toggle('is-present', isPresent);
         tagElement.classList.toggle('is-missing', !isPresent);
-        tagElement.classList.toggle('is-aliased', isPresent && tagsAndAliases.get(tagName) !== tagName);
-      }
-    }
+        tagElement.classList.toggle('is-aliased', isPresent && currentPostTags.get(tagName) !== tagName);
+      });
   }
 
   /**
diff --git a/src/lib/components/MediaBoxWrapper.js b/src/lib/components/MediaBoxWrapper.js
index 98e236e..7ea27f4 100644
--- a/src/lib/components/MediaBoxWrapper.js
+++ b/src/lib/components/MediaBoxWrapper.js
@@ -45,6 +45,9 @@ export class MediaBoxWrapper extends BaseComponent {
     return tagAliasesMap;
   }
 
+  /**
+   * @return {Map<string, string>|null}
+   */
   get tagsAndAliases() {
     if (!this.#tagsAndAliases) {
       this.#tagsAndAliases = this.#calculateMediaBoxTags();