diff --git a/frontend/js/favorites.js b/frontend/js/favorites.js
index dcded10..108e040 100644
--- a/frontend/js/favorites.js
+++ b/frontend/js/favorites.js
@@ -36,7 +36,7 @@ App.favorites = App.favorites || {};
             title: video.title || '',
             thumb: video.thumb || '',
             channel: video.channel || (meta && meta.channel) || '',
-            uploader: video.uploader || (meta && (meta.uploader || meta.channel)) || '',
+            uploader: video.uploader || (meta && meta.uploader) || '',
             duration: video.duration || (meta && meta.duration) || 0,
             meta: meta
         };
@@ -102,7 +102,7 @@ App.favorites = App.favorites || {};
             const card = document.createElement('div');
             card.className = 'favorite-card';
             card.dataset.favKey = item.key;
-            const uploaderText = item.uploader || item.channel || '';
+            const uploaderText = item.uploader || '';
             card.innerHTML = `
                 <button class="favorite-btn is-favorite" type="button" aria-pressed="true" aria-label="Remove from favorites" data-fav-key="${item.key}">♥</button>
                 <button class="video-menu-btn" type="button" aria-haspopup="true" aria-expanded="false" aria-label="More options">⋯</button>
diff --git a/frontend/js/videos.js b/frontend/js/videos.js
index 118eaf1..91cec0a 100644
--- a/frontend/js/videos.js
+++ b/frontend/js/videos.js
@@ -97,10 +97,14 @@ App.videos = App.videos || {};
         const totalSeconds = Math.floor(seconds);
         const hours = Math.floor(totalSeconds / 3600);
         const minutes = Math.floor((totalSeconds % 3600) / 60);
+        const secs = totalSeconds % 60;
         if (hours > 0) {
-            return `${hours}h ${String(minutes).padStart(2, '0')}m`;
+            return `${hours}:${String(minutes).padStart(2, '0')}:${String(secs).padStart(2, '0')}`;
         }
-        return `${minutes}m`;
+        if (minutes > 0) {
+            return `${minutes}:${String(secs).padStart(2, '0')}`;
+        }
+        return `${secs}`;
     };
 
     App.videos.buildImageProxyUrl = function(imageUrl) {
@@ -200,7 +204,7 @@ App.videos = App.videos || {};
             card.className = 'video-card';
             const durationText = App.videos.formatDuration(v.duration);
             const favoriteKey = App.favorites.getKey(v);
-            const uploaderText = v.uploader || v.channel || '';
+            const uploaderText = v.uploader || '';
             const tags = Array.isArray(v.tags) ? v.tags.filter(tag => tag) : [];
             const tagsMarkup = tags.length
                 ? `<div class="video-tags">${tags.map(tag => `<button class="video-tag" type="button" data-tag="${tag}">${tag}</button>`).join('')}</div>`