diff --git a/public/userarea/modal_analysis.php b/public/userarea/modal_analysis.php
index 50895b6..6d3cc98 100644
--- a/public/userarea/modal_analysis.php
+++ b/public/userarea/modal_analysis.php
@@ -136,14 +136,9 @@ $matrixGroups = array_values($matrixGroups);
                                             <button type="button"
                                                 class="list-group-item list-group-item-action analysis-matrix-item <?= $index === 0 ? 'active' : '' ?>"
                                                 data-matrix-id="<?= htmlspecialchars((string)($group['idmatrice'] ?? 'NO_MATRIX'), ENT_QUOTES, 'UTF-8') ?>">
-                                                <div class="fw-semibold">
-                                                    <?= htmlspecialchars(
-                                                        !empty($group['NomeMatriceTraduzione'])
-                                                            ? $group['NomeMatriceTraduzione']
-                                                            : (!empty($group['idmatrice']) ? ('Matrix without translation') : 'No Matrix'),
-                                                        ENT_QUOTES,
-                                                        'UTF-8'
-                                                    ) ?>
+                                                <div class="fw-semibold analysis-matrix-name"
+                                                    data-matrix-id="<?= htmlspecialchars((string)($group['idmatrice'] ?? 'NO_MATRIX'), ENT_QUOTES, 'UTF-8') ?>">
+                                                    <?= !empty($group['idmatrice']) ? ('#' . (int)$group['idmatrice']) : 'No Matrix' ?>
                                                 </div>
                                                 <div class="small text-muted">
                                                     ID: <?= !empty($group['idmatrice']) ? (int)$group['idmatrice'] : '-' ?>
@@ -193,14 +188,9 @@ $matrixGroups = array_values($matrixGroups);
 
                                                         <div class="small text-muted mt-1">
                                                             Matrix:
-                                                            <strong>
-                                                                <?= htmlspecialchars(
-                                                                    !empty($part['NomeMatriceTraduzione'])
-                                                                        ? $part['NomeMatriceTraduzione']
-                                                                        : (!empty($part['idmatrice']) ? 'Matrix without translation' : 'No Matrix'),
-                                                                    ENT_QUOTES,
-                                                                    'UTF-8'
-                                                                ) ?>
+                                                            <strong class="analysis-part-matrix-name"
+                                                                data-matrix-id="<?= htmlspecialchars($matrixId, ENT_QUOTES, 'UTF-8') ?>">
+                                                                <?= !empty($part['idmatrice']) ? ('#' . (int)$part['idmatrice']) : 'No Matrix' ?>
                                                             </strong>
                                                             <?php if (!empty($part['idmatrice'])): ?>
                                                                 <span class="small text-muted">(ID: <?= (int)$part['idmatrice'] ?>)</span>