diff --git a/frontend/app.js b/frontend/app.js
index c07f4a4..1799f4a 100644
--- a/frontend/app.js
+++ b/frontend/app.js
@@ -244,12 +244,16 @@ async function loadProtocols() {
 
 function setSort(mode) {
   sortBy = mode;
+  document.querySelectorAll('.sort-option').forEach(function(el) {
+    el.classList.toggle('active', el.textContent.trim().startsWith(mode === 'date' ? 'date' : 'relevance'));
+  });
   loadProtocols();
 }
 
 function renderSortToggle() {
-  document.querySelectorAll('.sort-option').forEach(function(el, i) {
-    var isDate = i === 0;
+  // Update active state based on current sortBy
+  document.querySelectorAll('.sort-option').forEach(function(el) {
+    var isDate = el.textContent.trim().startsWith('date');
     el.classList.toggle('active', (sortBy === 'date' && isDate) || (sortBy === 'relevance' && !isDate));
   });
 }
@@ -334,10 +338,10 @@ function renderDetail(p) {
       '<div class="content"><h4>' + escapeHtml(s.headline) + '</h4><p>' + escapeHtml(s.description || '') + '</p></div></div>';
   }).join('');
   const forkNotice = p.forked_from ? '<div class="fork-notice">forked from: <a href="#protocol/' + p.forked_from + '" onclick="showDetail(\'' + p.forked_from + '\');return false">' + p.forked_from + '</a></div>' : '';
-  const sourceLine = p.source ? 'SOURCE: ' + escapeHtml(p.source) : '';
+  const sourceLine = (p.source && p.source !== '@' + (p.author || '') && p.source !== '') ? 'SOURCE: ' + escapeHtml(p.source) : '';
   var sourceLink = p.source_url ? ' · <a href="' + escapeHtml(p.source_url) + '" target="_blank">view_original</a>' : '';
-  var authorLine = p.author ? ' · authored by <a href="#user/' + p.author + '" onclick="showUser(\'' + p.author + '\');return false">@' + escapeHtml(p.author) + '</a>' : '';
-  var dateLine = p.created_at ? ' · ' + formatDate(p.created_at) : '';
+  var authorLine = p.author ? (sourceLine ? ' · ' : '') + 'contributor: <a href="#users/' + p.author + '" onclick="showUser(\'' + p.author + '\');return false">@' + escapeHtml(p.author) + '</a>' : '';
+  var dateLine = p.created_at ? ' · added ' + formatDate(p.created_at) : '';
 
   return '<div class="detail-header"><div class="tag-row">' + tags + '</div>' +
     '<h1>' + escapeHtml(p.title) + '</h1>' +
@@ -735,9 +739,9 @@ async function showCollectionDetail(slug) {
         }
       }
     }
-    var sourceLine = c.source ? 'SOURCE: ' + escapeHtml(c.source) : '';
-    var authorLine = c.author ? ' · authored by <a href="#user/' + c.author + '" onclick="showUser(\'' + c.author + '\');return false">@' + escapeHtml(c.author) + '</a>' : '';
-  var dateLine = c.created_at ? ' · ' + formatDate(c.created_at) : '';
+    var sourceLine = (c.source && c.source !== '@' + (c.author || '') && c.source !== '') ? 'SOURCE: ' + escapeHtml(c.source) : '';
+    var authorLine = c.author ? (sourceLine ? ' · ' : '') + 'contributor: <a href="#users/' + c.author + '" onclick="showUser(\'' + c.author + '\');return false">@' + escapeHtml(c.author) + '</a>' : '';
+  var dateLine = c.created_at ? ' · added ' + formatDate(c.created_at) : '';
 
   document.getElementById('collectionDetailContent').innerHTML =
     '<div class="detail-header"><h1>' + escapeHtml(c.title) + '</h1>' +