diff --git a/svelte-app/src/lib/export.ts b/svelte-app/src/lib/export.ts
index 9943c33..a9bcb76 100644
--- a/svelte-app/src/lib/export.ts
+++ b/svelte-app/src/lib/export.ts
@@ -143,7 +143,7 @@ function stripButtonSuffix(label: string): string {
 
 function getIgnitionTagPath(label: string, mcm: string): string | null {
   if (!label) return null;
-  if (/^MCM\d*/i.test(label)) return null;
+  if (/^MCM\d*/i.test(label)) return `System/${mcm}/${label}`;
   for (const rule of TAG_PATH_RULES) {
     if (rule.pattern.test(label)) return `System/${mcm}/${rule.path}/${stripButtonSuffix(label)}`;
   }
@@ -650,7 +650,8 @@ async function emitEpc(lines: string[], sym: PlacedSymbol, label: string, outerT
     parts.push(`    <rect x="${-rb.w}" y="${-rb.h / 2}" width="${rb.w}" height="${rb.h}" fill="#aaaaaa" stroke="#000000" stroke-width="${EPC_CONFIG.lineWidth}" transform="translate(${plx},${ply}) rotate(${rAngle.toFixed(2)})" />`);
   }
 
-  lines.push(`  <g id="${label}" inkscape:label="${label}"${tAttr}>`);
+  const igAttrs = getIgnitionAttrs(label);
+  lines.push(`  <g id="${label}" inkscape:label="${label}"${igAttrs}${tAttr}>`);
   lines.push(parts.join('\n'));
   lines.push('  </g>');
 }