diff --git a/src/lib/navigator/EventNetwork/Legend.svelte b/src/lib/navigator/EventNetwork/Legend.svelte
index 8dd5bb7..e955b90 100644
--- a/src/lib/navigator/EventNetwork/Legend.svelte
+++ b/src/lib/navigator/EventNetwork/Legend.svelte
@@ -344,12 +344,11 @@
               
               <div class="space-y-1 max-h-48 overflow-y-auto">
                 {#each sortedAnchors as tag}
-                  {@const tagId = `${tag.type}-${tag.label}`}
-                  {@const isDisabled = disabledTags.has(tagId)}
+                  {@const isDisabled = disabledTags.has(tag.value)}
                   <button
                     class="flex items-center gap-2 w-full p-2 rounded text-left border-none bg-none cursor-pointer transition hover:bg-black/5 dark:hover:bg-white/5"
-                    onclick={() => onTagToggle(tagId)}
-                    onkeydown={(e) => e.key === 'Enter' || e.key === ' ' ? onTagToggle(tagId) : null}
+                    onclick={() => onTagToggle(tag.value)}
+                    onkeydown={(e) => e.key === 'Enter' || e.key === ' ' ? onTagToggle(tag.value) : null}
                     title={isDisabled ? `Click to show ${tag.label}` : `Click to hide ${tag.label}`}
                     aria-pressed={!isDisabled}
                   >
diff --git a/src/lib/navigator/EventNetwork/index.svelte b/src/lib/navigator/EventNetwork/index.svelte
index aea8c8a..3c88183 100644
--- a/src/lib/navigator/EventNetwork/index.svelte
+++ b/src/lib/navigator/EventNetwork/index.svelte
@@ -168,7 +168,7 @@
   let totalPersonCount = $state(0);
   let displayedPersonCount = $state(0);
   let hasInitializedPersons = $state(false);
-  let hasInitializedTags = $state(false);
+  let hasInitializedTags = $state(new Map<string, boolean>());
 
 
   // Update dimensions when container changes
@@ -302,18 +302,18 @@
           value: `${n.tagType}-${n.title}`, // Use the correct tag ID format for toggling
         }));
         
-      // Auto-disable all tag anchors by default (only on first time showing)
-      if (!hasInitializedTags && tagAnchors.length > 0) {
+      // Auto-disable all tag anchors by default (only on first time showing this tag type)
+      if (!hasInitializedTags.get(selectedTagType) && tagAnchors.length > 0) {
         tagAnchorInfo.forEach(anchor => {
           disabledTags.add(anchor.value);
         });
-        hasInitializedTags = true;
+        hasInitializedTags.set(selectedTagType, true);
       }
     } else {
       tagAnchorInfo = [];
-      // Reset initialization flag when tag anchors are hidden
-      if (hasInitializedTags && tagAnchorInfo.length === 0) {
-        hasInitializedTags = false;
+      // Reset initialization flag for this tag type when tag anchors are hidden
+      if (hasInitializedTags.get(selectedTagType) && tagAnchorInfo.length === 0) {
+        hasInitializedTags.set(selectedTagType, false);
       }
     }