diff --git a/lib/chiya_web/components/public_components.ex b/lib/chiya_web/components/public_components.ex
index 883127e..f501b82 100644
--- a/lib/chiya_web/components/public_components.ex
+++ b/lib/chiya_web/components/public_components.ex
@@ -153,6 +153,12 @@ defmodule ChiyaWeb.PublicComponents do
               <%= String.slice(note.content, 0..150) %>
             </p>
           <% end %>
+
+          <%= not Enum.empty?(note.tags) do %>
+          <footer class="mt-2">
+            <.tags note={note}>
+          </footer>
+          <% end %>
         </a>
       <% end %>
     </section>
diff --git a/lib/chiya_web/controllers/page_controller.ex b/lib/chiya_web/controllers/page_controller.ex
index 3879a9e..730c62d 100644
--- a/lib/chiya_web/controllers/page_controller.ex
+++ b/lib/chiya_web/controllers/page_controller.ex
@@ -93,7 +93,7 @@ defmodule ChiyaWeb.PageController do
 
         id ->
           channel = Chiya.Channels.get_channel!(id)
-          notes = Chiya.Notes.list_notes_by_channel_updated(channel, 999)
+          notes = Chiya.Notes.list_notes_by_channel_published(channel, 999)
           [channel, notes]
       end
 
diff --git a/lib/chiya_web/controllers/page_html/bookmarks.html.heex b/lib/chiya_web/controllers/page_html/bookmarks.html.heex
index 961a504..d97b6b8 100644
--- a/lib/chiya_web/controllers/page_html/bookmarks.html.heex
+++ b/lib/chiya_web/controllers/page_html/bookmarks.html.heex
@@ -17,11 +17,11 @@
 <% else %>
   <section class="mx-auto max-w-2xl">
     <.header>
-      Wiki
+      Bookmarks
     </.header>
 
     <section class="prose prose-gruvbox mt-6">
-      Wiki is not set up.
+      Bookmarks not set up.
     </section>
   </section>
 <% end %>