diff --git a/app/templates/flagged.html b/app/templates/flagged.html
index d7edc43..7780f26 100644
--- a/app/templates/flagged.html
+++ b/app/templates/flagged.html
@@ -118,36 +118,20 @@
           <!-- Author -->
           <td class="col-author">
             {% if item.author_handle %}
-            <a href="https://bsky.app/profile/{{ item.author_handle }}" target="_blank" rel="noopener" class="author-link">
-              @{{ item.author_handle }}
-            </a>
-            {% else %}
-            <span class="author-did" title="{{ item.author_did }}">{{ item.author_did[:30] }}…</span>
-            {% endif %}
-            {% if item.item_type == 'mention' and item.mentioned_handle %}
-            <span class="mention-arrow">→</span>
-            <a href="https://bsky.app/profile/{{ item.mentioned_handle }}" target="_blank" rel="noopener" class="author-link">
-              @{{ item.mentioned_handle }}
+            <a href="https://{{ item.author_instance }}/@{{ item.author_username }}" target="_blank" rel="noopener" class="author-link">
+              {{ item.author_handle }}
             </a>
             {% endif %}
           </td>
 
           <!-- Content Text -->
           <td class="col-text">
-            {% if item.source_type == 'post' %}
-            <a href="{{ url_for('statuses.detail', encoded_uri=encode_uri(item.item_id)) }}" class="content-link">
+            {% if item.url %}
+            <a href="{{ item.url }}" target="_blank" rel="noopener" class="content-link">
               {{ item.text | truncate_text(200) }}
             </a>
             {% else %}
-            {# Convert at://did:plc:xxx/app.bsky.feed.post/yyy to https://bsky.app/profile/handle/post/yyy #}
-            {% set uri_parts = item.item_id.replace('at://', '').split('/') %}
-            {% if uri_parts|length >= 3 and item.author_handle %}
-              <a href="https://bsky.app/profile/{{ item.author_handle }}/post/{{ uri_parts[2] }}" target="_blank" rel="noopener" class="content-link">
-                {{ item.text | truncate_text(200) }}
-              </a>
-            {% else %}
-              <span class="content-text">{{ item.text | truncate_text(200) }}</span>
-            {% endif %}
+            <span class="content-text">{{ item.text | truncate_text(200) }}</span>
             {% endif %}
           </td>