diff --git a/src/components/Article/Article.module.scss b/src/components/Article/Article.module.scss
index d812534a..df9bce6b 100644
--- a/src/components/Article/Article.module.scss
+++ b/src/components/Article/Article.module.scss
@@ -29,6 +29,17 @@ img {
   font-size: 1.6rem;
   line-height: 1.6;
 
+  details {
+    text-align: center;
+    background-color: lightgray;
+    line-height: 3em;
+  }
+
+  details p {
+    text-align: left;
+    line-height: normal;
+  }
+
   blockquote,
   blockquote[data-type='punchline'] {
     clear: both;
diff --git a/src/components/Article/Comment/Comment.tsx b/src/components/Article/Comment/Comment.tsx
index bd840652..44b7b46a 100644
--- a/src/components/Article/Comment/Comment.tsx
+++ b/src/components/Article/Comment/Comment.tsx
@@ -38,7 +38,7 @@ export const Comment = (props: Props) => {
   const [loading, setLoading] = createSignal(false)
   const [editMode, setEditMode] = createSignal(false)
   const [clearEditor, setClearEditor] = createSignal(false)
-  const { session } = useSession()
+  const { author } = useSession()
 
   const {
     actions: { createReaction, deleteReaction, updateReaction },
@@ -52,7 +52,7 @@ export const Comment = (props: Props) => {
     actions: { showSnackbar },
   } = useSnackbar()
 
-  const isCommentAuthor = createMemo(() => props.comment.created_by?.slug === session()?.author?.slug)
+  const isCommentAuthor = createMemo(() => props.comment.created_by?.slug === author().slug)
 
   const comment = createMemo(() => props.comment)
   const body = createMemo(() => (comment().body || '').trim())
@@ -216,7 +216,7 @@ export const Comment = (props: Props) => {
               </Show>
 
               {/*<SharePopup*/}
-              {/*  title={'artile.title'}*/}
+              {/*  title={'article.title'}*/}
               {/*  description={getDescription(body())}*/}
               {/*  containerCssClass={stylesHeader.control}*/}
               {/*  trigger={*/}
diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx
index e7df3b4c..00113531 100644
--- a/src/components/Article/FullArticle.tsx
+++ b/src/components/Article/FullArticle.tsx
@@ -72,9 +72,14 @@ export const FullArticle = (props: Props) => {
   const formattedDate = createMemo(() => formatDate(new Date(props.article.created_at * 1000)))
 
   const mainTopic = createMemo(() => {
-    const mt = props.article.topics.length > 0 ? props.article.topics[0] : null
-    mt.title = lang() == 'en' ? capitalize(mt.slug.replace('-', ' ')) : mt.title
-    return mt
+    const main_topic_slug = props.article.topics.length > 0 ? props.article.main_topic : null
+    const mt = props.article.topics.find((t) => t.slug === main_topic_slug)
+    if (mt) {
+      mt.title = lang() == 'en' ? capitalize(mt.slug.replace('-', ' ')) : mt.title
+      return mt
+    } else {
+      return props.article.topics[0]
+    }
   })
 
   const canEdit = () => props.article.authors?.some((a) => a.slug === author()?.slug)
diff --git a/src/components/Feed/ArticleCard/ArticleCard.tsx b/src/components/Feed/ArticleCard/ArticleCard.tsx
index f5f95296..73a7a317 100644
--- a/src/components/Feed/ArticleCard/ArticleCard.tsx
+++ b/src/components/Feed/ArticleCard/ArticleCard.tsx
@@ -86,7 +86,10 @@ const getTitleAndSubtitle = (
 export const ArticleCard = (props: ArticleCardProps) => {
   const { t, lang, formatDate } = useLocalize()
   const { author } = useSession()
-  const mainTopic = props.article.topics[0]
+  const mainTopicSlug = props.article.main_topic
+  const mainTopic = props.article.topics.find((t) => t.slug === mainTopicSlug)
+  const mainTopicTitle =
+    lang() === 'ru' && mainTopic?.title ? mainTopic.title : mainTopicSlug.replace('-', ' ')
 
   const formattedDate = createMemo<string>(() => {
     return formatDate(new Date(props.article.created_at * 1000))
@@ -171,12 +174,10 @@ export const ArticleCard = (props: ArticleCardProps) => {
           </div>
         </Show>
 
-        <Show when={!props.settings?.isGroup && mainTopic}>
+        <Show when={!props.settings?.isGroup && mainTopicSlug}>
           <CardTopic
-            title={
-              lang() === 'ru' && mainTopic.title ? mainTopic.title : mainTopic?.slug?.replace('-', ' ')
-            }
-            slug={mainTopic.slug}
+            title={mainTopicTitle}
+            slug={mainTopicSlug}
             isFloorImportant={props.settings?.isFloorImportant}
             isFeedMode={true}
             class={clsx(styles.shoutTopic, { [styles.shoutTopicTop]: props.settings.isShort })}
diff --git a/src/graphql/query/core/article-load.ts b/src/graphql/query/core/article-load.ts
index 70820fe0..f99e5e7e 100644
--- a/src/graphql/query/core/article-load.ts
+++ b/src/graphql/query/core/article-load.ts
@@ -23,6 +23,7 @@ export default gql`
         created_at
       }
       # community
+      main_topic
       topics {
         id
         title
diff --git a/src/graphql/query/core/articles-load-by.ts b/src/graphql/query/core/articles-load-by.ts
index 3970da4a..2f8129b6 100644
--- a/src/graphql/query/core/articles-load-by.ts
+++ b/src/graphql/query/core/articles-load-by.ts
@@ -12,6 +12,7 @@ export default gql`
       layout
       cover
       lead
+      main_topic
       topics {
         id
         title
diff --git a/src/graphql/query/core/articles-load-drafts.ts b/src/graphql/query/core/articles-load-drafts.ts
index f80ab614..944739d7 100644
--- a/src/graphql/query/core/articles-load-drafts.ts
+++ b/src/graphql/query/core/articles-load-drafts.ts
@@ -11,6 +11,7 @@ export default gql`
       cover
       # community
       media
+      main_topic
       topics {
         id
         title
diff --git a/src/graphql/query/core/articles-load-feed.ts b/src/graphql/query/core/articles-load-feed.ts
index d9c2fc6e..01789b08 100644
--- a/src/graphql/query/core/articles-load-feed.ts
+++ b/src/graphql/query/core/articles-load-feed.ts
@@ -10,6 +10,7 @@ export default gql`
       layout
       cover
       # community
+      main_topic
       topics {
         id
         title
diff --git a/src/graphql/query/core/articles-load-followed.ts b/src/graphql/query/core/articles-load-followed.ts
index b190ca4b..25260637 100644
--- a/src/graphql/query/core/articles-load-followed.ts
+++ b/src/graphql/query/core/articles-load-followed.ts
@@ -9,6 +9,7 @@ export default gql`
       slug
       cover
       # community
+      main_topic
       topics {
         # id
         title
diff --git a/src/graphql/query/core/articles-load-search.ts b/src/graphql/query/core/articles-load-search.ts
index 14bd825d..e38ba025 100644
--- a/src/graphql/query/core/articles-load-search.ts
+++ b/src/graphql/query/core/articles-load-search.ts
@@ -9,6 +9,7 @@ export default gql`
       slug
       layout
       cover
+      main_topic
       topics {
         id
         title