diff --git a/database/topic.go b/database/topic.go
index f8b294f..3e9e9ce 100644
--- a/database/topic.go
+++ b/database/topic.go
@@ -229,13 +229,13 @@ func AmListTopics(ctx context.Context, confid int32, uid int32, viewOption int,
 		if !ignoreSticky {
 			tail = "(t.sticky = 1 OR " + tail + ")"
 		}
-		whereClause = "t.archived = 0 AND hidden = 0 AND " + tail
+		whereClause = "t.archived = 0 AND (s.hidden IS NULL OR s.hidden = 0) AND " + tail
 	case TopicViewActive, TopicViewAllVisible:
-		whereClause = "t.archived = 0 AND hidden = 0"
+		whereClause = "t.archived = 0 AND (s.hidden IS NULL OR s.hidden = 0)"
 	case TopicViewHidden:
-		whereClause = "hidden = 1"
+		whereClause = "s.hidden = 1"
 	case TopicViewArchive:
-		whereClause = "t.archived = 1 AND hidden = 0"
+		whereClause = "t.archived = 1 AND (s.hidden IS NULL OR s.hidden = 0)"
 	default:
 		return nil, errors.New("invalid view option specified")
 	}
diff --git a/ui/views/topiclist.jet b/ui/views/topiclist.jet
index 222950a..9d4557d 100644
--- a/ui/views/topiclist.jet
+++ b/ui/views/topiclist.jet
@@ -83,7 +83,7 @@
                             </td>
                             <td class="px-4 py-3 text-sm">
                                 <a href="{{ urlStem }}/r/{{ t.Number }}" 
-                                    class="text-blue-700 hover:text-blue-900 font-medium">{{ t.Name }}</a>
+                                    class="text-blue-700 hover:text-blue-900 font-medium">{{ t.Name | raw }}</a>
                             </td>
                             <td class="px-4 py-3 whitespace-nowrap text-sm text-right">
                                 <a href="{{ urlStem }}/r/{{ t.Number }}"