diff --git a/lib/storage/followed-tags.js b/lib/storage/followed-tags.js
index 079ca38..c0cc120 100644
--- a/lib/storage/followed-tags.js
+++ b/lib/storage/followed-tags.js
@@ -87,7 +87,7 @@ export async function isTagFollowed(collections, tag) {
   if (!ap_followed_tags) return false;
   const normalizedTag = tag.toLowerCase().trim().replace(/^#/, "");
   const doc = await ap_followed_tags.findOne({ tag: normalizedTag });
-  return !!doc;
+  return !!(doc?.followedAt);
 }
 
 /**
@@ -96,7 +96,7 @@ export async function isTagFollowed(collections, tag) {
  * @returns {string} Actor URL
  */
 export function getTagsPubActorUrl(tag) {
-  return `https://tags.pub/user/${tag.toLowerCase()}`;
+  return `https://tags.pub/user/${tag.toLowerCase().replace(/^#/, "")}`;
 }
 
 /**
diff --git a/views/activitypub-tag-timeline.njk b/views/activitypub-tag-timeline.njk
index 416e594..e8fa036 100644
--- a/views/activitypub-tag-timeline.njk
+++ b/views/activitypub-tag-timeline.njk
@@ -81,7 +81,7 @@
       </nav>
     {% endif %}
 
-    {# Infinite scroll sentinel (Task 5) #}
+    {# Infinite scroll load-more trigger #}
     {% if before %}
       <div class="ap-load-more"
         id="ap-load-more"