diff --git a/static/script.js b/static/script.js
index 70c005d..548ccb1 100644
--- a/static/script.js
+++ b/static/script.js
@@ -2097,7 +2097,7 @@ function renderLineupRow(row) {
                 data-side="${escapeHtml(side)}"
                 data-first-name="${escapeHtml(player.firstName || "")}"
                 data-last-name="${escapeHtml(player.lastName || "")}"
-                data-role="${escapeHtml(player.positionFull || player.position || "")}"
+                data-role="${escapeHtml(player.positionFull || "")}"
             >
                 <div class="player-inline">
                     <div class="player-inline-text">
diff --git a/templates/match_workspace.html b/templates/match_workspace.html
index 74e7468..68fe430 100644
--- a/templates/match_workspace.html
+++ b/templates/match_workspace.html
@@ -346,6 +346,7 @@
                       data-player-first="{{ p.first_name or '' }}"
                       data-player-number="{{ p.number or '' }}"
                       data-player-position="{{ p.position or '' }}"
+                      data-player-position-full="{{ p.position_full or '' }}"
                       data-player-captain="{{ 1 if p.is_captain else 0 }}"
                     >
                       <td class="num-cell">{{ p.number }}</td>
@@ -356,7 +357,7 @@
     data-side="home"
   data-first-name="{{ p.first_name or '' }}"
   data-last-name="{{ p.last_name or '' }}"
-data-role="{{ p.position_full or p.position or '' }}"
+data-role="{{ p.position_full or '' }}"
   >
     <div class="player-inline-text">
       <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -454,6 +455,7 @@ data-role="{{ p.position_full or p.position or '' }}"
                       data-player-first="{{ p.first_name or '' }}"
                       data-player-number="{{ p.number or '' }}"
                       data-player-position="{{ p.position or '' }}"
+                      data-player-position-full="{{ p.position_full or '' }}"
                       data-player-captain="{{ 1 if p.is_captain else 0 }}"
                     >
                       <td class="num-cell">{{ p.number }}</td>
@@ -464,7 +466,7 @@ data-role="{{ p.position_full or p.position or '' }}"
     data-side="home"
   data-first-name="{{ p.first_name or '' }}"
   data-last-name="{{ p.last_name or '' }}"
-data-role="{{ p.position_full or p.position or '' }}"
+data-role="{{ p.position_full or '' }}"
   >
     <div class="player-inline-text">
       <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -572,6 +574,7 @@ data-role="{{ p.position_full or p.position or '' }}"
                       data-player-first="{{ p.first_name or '' }}"
                       data-player-number="{{ p.number or '' }}"
                       data-player-position="{{ p.position or '' }}"
+                      data-player-position-full="{{ p.position_full or '' }}"
                       data-player-captain="{{ 1 if p.is_captain else 0 }}"
                     >
                       <td class="num-cell">{{ p.number }}</td>
@@ -582,7 +585,7 @@ data-role="{{ p.position_full or p.position or '' }}"
     data-side="away"
   data-first-name="{{ p.first_name or '' }}"
   data-last-name="{{ p.last_name or '' }}"
-data-role="{{ p.position_full or p.position or '' }}"
+data-role="{{ p.position_full or '' }}"
   >
     <div class="player-inline-text">
       <span class="last-name">{{ p.last_name or p.player_name }}</span>
@@ -680,6 +683,7 @@ data-role="{{ p.position_full or p.position or '' }}"
                       data-player-first="{{ p.first_name or '' }}"
                       data-player-number="{{ p.number or '' }}"
                       data-player-position="{{ p.position or '' }}"
+                      data-player-position-full="{{ p.position_full or '' }}"
                       data-player-captain="{{ 1 if p.is_captain else 0 }}"
                     >
                       <td class="num-cell">{{ p.number }}</td>
@@ -690,7 +694,7 @@ data-role="{{ p.position_full or p.position or '' }}"
     data-side="away"
   data-first-name="{{ p.first_name or '' }}"
   data-last-name="{{ p.last_name or '' }}"
-    data-role="{{ p.position_full or p.position or '' }}"
+    data-role="{{ p.position_full or '' }}"
   >
     <div class="player-inline-text">
       <span class="last-name">{{ p.last_name or p.player_name }}</span>