diff --git a/public/s/css/f0ckm.css b/public/s/css/f0ckm.css
index 801a447..ddf3d4c 100644
--- a/public/s/css/f0ckm.css
+++ b/public/s/css/f0ckm.css
@@ -7179,6 +7179,7 @@ span#favs {
   padding: 5px;
   background: var(--badge-bg);
   border-top: 1px solid var(--nav-border-color);
+  border-bottom: 1px solid var(--nav-border-color);
 }
 
 span#favs[hidden] {
@@ -14038,7 +14039,7 @@ textarea#profile_description {
   align-items: flex-start;
   width: 100%;
   max-width: 100%;
-  min-height: 120px;
+  min-height: 90px;
   box-sizing: border-box;
   margin-bottom: 10px;
 }
diff --git a/src/inc/routeinc/f0cklib.mjs b/src/inc/routeinc/f0cklib.mjs
index 216caa5..bb5c349 100644
--- a/src/inc/routeinc/f0cklib.mjs
+++ b/src/inc/routeinc/f0cklib.mjs
@@ -1029,6 +1029,8 @@ export default {
           and uha.hall_id = ${userHallId}
           and items.active = true
           ${mimeSQL}
+          ${!session && getGlobalfilter() ? db`and not exists (select 1 from tags_assign where item_id = items.id and (${db.unsafe(getGlobalfilter())}))` : db``}
+          ${!session && cfg.websrv.public_untagged === false ? db`and exists (select 1 from tags_assign where item_id = items.id)` : db``}
           ${excludedTags.length > 0 ? db`and not exists (select 1 from tags_assign where item_id = items.id and tag_id = any(${excludedTags}::int[]))` : db``}
         order by random()
         limit 1
@@ -1056,6 +1058,7 @@ export default {
         WHERE items.active = true
           ${mimeSQL}
           ${checkFilter ? db`AND filter_ta.tag_id IS NULL` : db``}
+          ${!session && cfg.websrv.public_untagged === false ? db`AND EXISTS (SELECT 1 FROM tags_assign WHERE item_id = items.id)` : db``}
           ${excludedTags.length > 0 ? db`AND NOT EXISTS (SELECT 1 FROM tags_assign WHERE item_id = items.id AND tag_id = ANY(${excludedTags}::int[]))` : db``}
           ${!useTagIdOpt ? db`AND ${db.unsafe(globalModeQuery)}` : db``}
         ORDER BY random()
diff --git a/views/item-partial-legacy.html b/views/item-partial-legacy.html
index 0494c68..bc8f6d6 100644
--- a/views/item-partial-legacy.html
+++ b/views/item-partial-legacy.html
@@ -210,6 +210,7 @@
             </div>
         </div>
 
+        @if(session || !hide_comments_from_public)
         <div id="comments-container"
              data-item-id="{{ item.id }}"
              @if(session) data-user="{{ session.user }}" @endif
@@ -221,6 +222,7 @@
             </div>
             @endif
         </div>
+        @endif
         <button class="mobile-scroll-to-top" title="Back to top" aria-label="Scroll to top"><i class="fa-solid fa-chevron-up"></i></button>
         <script id="initial-subscription" type="application/json">{{ isSubscribed }}</script>