diff --git a/themes/one-pager/assets/js/scripts.js b/themes/one-pager/assets/js/scripts.js
index 1209bcb..cb84aa1 100644
--- a/themes/one-pager/assets/js/scripts.js
+++ b/themes/one-pager/assets/js/scripts.js
@@ -188,22 +188,21 @@ function renderMusicTracks(tracks, containerId, randomize = false) {
 
   selected.forEach(track => {
     let title = '', url = '', image = '', artist = '', album = '',
-    trackNumber = '', duration = '', released = '', language = '',
-    tags = [], alt = '', content = '';
+    genreTags = [], alt = '', content = '';
 
     if (track.tags) {
       track.tags.forEach(tag => {
-        if (tag[0] === 'title') title = tag[1];
-        else if (tag[0] === 'url') url = tag[1];
-        else if (tag[0] === 'image') image = tag[1];
-        else if (tag[0] === 'artist') artist = tag[1];
-        else if (tag[0] === 'album') album = tag[1];
-        else if (tag[0] === 'track_number') trackNumber = tag[1];
-        else if (tag[0] === 'duration') duration = tag[1];
-        else if (tag[0] === 'released') released = tag[1];
-        else if (tag[0] === 'language') language = tag[1];
-        else if (tag[0] === 't') tags.push(tag[1]);
-        else if (tag[0] === 'alt') alt = tag[1];
+        const key = tag[0];
+        const value = tag[1];
+
+        if (key === 'title') title = value;
+        else if (key === 'url') url = value;
+        else if (key === 'image') image = value;
+        else if (key === 'artist') artist = value;
+        else if (key === 'album') album = value;
+        // ONLY collect tags with key 't' (genre tags)
+        else if (key === 't') genreTags.push(value);
+        else if (key === 'alt') alt = value;
       });
     }
     content = track.content || '';
@@ -219,23 +218,20 @@ function renderMusicTracks(tracks, containerId, randomize = false) {
     ${album ? `<p class="music-album">${album}</p>` : ''}
     </div>
     ${url ? `<audio controls preload="none"><source src="${url}" type="audio/mpeg">Your browser does not support the audio element.</audio>` : ''}
-    <div class="music-details">
-    ${trackNumber ? `<span class="track-number">Track ${trackNumber}</span>` : ''}
-    ${duration ? `<span class="duration">${duration}s</span>` : ''}
-    ${released ? `<span class="released">${released}</span>` : ''}
-    ${language ? `<span class="language">${language}</span>` : ''}
-    </div>
-    <div class="music-tags">
-    ${tags.map(t => `<span class="tag"><span>${t}</span></span>`).join('')}
-    </div>
-    ${content ? `
-      <button class="lyrics-toggle"><span>Show Info</span></button>
-      <div class="lyrics" style="display: none;">${content.replace(/\n/g, '<br>')}</div>
-      ` : ''}
-      `;
 
-      card.innerHTML = cardHTML;
-      container.appendChild(card);
+    ${genreTags.length > 0 ? `
+      <div class="music-tags">
+      ${genreTags.map(t => `<span class="tag"><span>${t}</span></span>`).join('')}
+      </div>
+      ` : ''}
+      ${content ? `
+        <button class="lyrics-toggle"><span>Show Info</span></button>
+        <div class="lyrics" style="display: none;">${content.replace(/\n/g, '<br>')}</div>
+        ` : ''}
+        `;
+
+        card.innerHTML = cardHTML;
+        container.appendChild(card);
   });
 
   initMusicEventListeners();