diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 74561c5fe..4710942b6 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -151,7 +151,6 @@ export default {
         friendsCount: '<-[:FRIENDS]->(related:User)',
         followingCount: '-[:FOLLOWS]->(related:User)',
         followedByCount: '<-[:FOLLOWS]-(related:User)',
-        commentsCount: '-[:WROTE]->(r:Comment)',
         commentedCount: '-[:WROTE]->(:Comment)-[:COMMENTS]->(related:Post)',
         shoutedCount: '-[:SHOUTED]->(related:Post)',
         badgesCount: '<-[:REWARDED]-(related:Badge)',
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 519af14ae..cbbcddfc9 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -29,11 +29,6 @@ type Post {
   categories: [Category]! @relation(name: "CATEGORIZED", direction: "OUT")
 
   comments: [Comment]! @relation(name: "COMMENTS", direction: "IN")
-  commentsCount: Int!
-    @cypher(
-      statement: "MATCH (this)<-[:COMMENTS]-(r:Comment) WHERE NOT r.deleted = true AND NOT r.disabled = true  RETURN COUNT(r)"
-    )
-
   shoutedBy: [User]! @relation(name: "SHOUTED", direction: "IN")
   shoutedCount: Int!
     @cypher(
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index e3e8f8450..46e699410 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -64,7 +64,6 @@ type User {
   )
 
   comments: [Comment]! @relation(name: "WROTE", direction: "OUT")
-  commentsCount: Int! @cypher(statement: "MATCH (this)-[:WROTE]->(r:Comment) WHERE NOT r.deleted = true AND NOT r.disabled = true RETURN COUNT(r)")
   commentedCount: Int! @cypher(statement: "MATCH (this)-[:WROTE]->(r:Comment)-[:COMMENTS]->(p:Post) WHERE NOT r.deleted = true AND NOT r.disabled = true AND NOT p.deleted = true AND NOT p.disabled = true RETURN COUNT(DISTINCT(p))")
 
   shouted: [Post]! @relation(name: "SHOUTED", direction: "OUT")
@@ -143,7 +142,6 @@ type Query {
     followedByCount: Int
     followedByCurrentUser: Boolean
     contributionsCount: Int
-    commentsCount: Int
     commentedCount: Int
     shoutedCount: Int
     badgesCount: Int
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 4abade0fa..608f6468d 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -260,7 +260,7 @@ Then("the first post on the landing page has the title:", title => {
 Then(
   "the page {string} returns a 404 error with a message:",
   (route, message) => {
-    // TODO: how can we check HTTP codes with cypress?
+    cy.request({ url: route, failOnStatusCode: false }).its('status').should('eq', 404)
     cy.visit(route, { failOnStatusCode: false });
     cy.get(".error").should("contain", message);
   }
diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 9096fb6e8..c53d0a231 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -67,7 +67,7 @@ import { mapGetters, mapMutations } from 'vuex'
 import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
 import ContentViewer from '~/components/Editor/ContentViewer'
-import HcEditCommentForm from '~/components/comments/EditCommentForm/EditCommentForm'
+import HcEditCommentForm from '~/components/EditCommentForm/EditCommentForm'
 
 export default {
   data: function() {
diff --git a/webapp/components/comments/CommentForm/spec.js b/webapp/components/CommentForm/CommentForm.spec.js
similarity index 98%
rename from webapp/components/comments/CommentForm/spec.js
rename to webapp/components/CommentForm/CommentForm.spec.js
index 2d212c91d..5e7c952af 100644
--- a/webapp/components/comments/CommentForm/spec.js
+++ b/webapp/components/CommentForm/CommentForm.spec.js
@@ -1,5 +1,5 @@
 import { mount, createLocalVue } from '@vue/test-utils'
-import CommentForm from './index.vue'
+import CommentForm from './CommentForm'
 import Styleguide from '@human-connection/styleguide'
 import Vuex from 'vuex'
 import MutationObserver from 'mutation-observer'
diff --git a/webapp/components/comments/CommentForm/index.vue b/webapp/components/CommentForm/CommentForm.vue
similarity index 84%
rename from webapp/components/comments/CommentForm/index.vue
rename to webapp/components/CommentForm/CommentForm.vue
index e0e0058e5..795727578 100644
--- a/webapp/components/comments/CommentForm/index.vue
+++ b/webapp/components/CommentForm/CommentForm.vue
@@ -24,10 +24,10 @@
 
 <script>
 import gql from 'graphql-tag'
-import HcEditor from '~/components/Editor/Editor'
-import PostCommentsQuery from '~/graphql/PostCommentsQuery.js'
-import CommentMutations from '~/graphql/CommentMutations.js'
 import { mapGetters } from 'vuex'
+import HcEditor from '~/components/Editor/Editor'
+import PostQuery from '~/graphql/PostQuery'
+import CommentMutations from '~/graphql/CommentMutations'
 
 export default {
   components: {
@@ -35,7 +35,6 @@ export default {
   },
   props: {
     post: { type: Object, default: () => {} },
-    comments: { type: Array, default: () => [] },
   },
   data() {
     return {
@@ -70,18 +69,18 @@ export default {
       this.disabled = true
       this.$apollo
         .mutate({
-          mutation: CommentMutations().CreateComment,
+          mutation: CommentMutations(this.$i18n).CreateComment,
           variables: {
             postId: this.post.id,
             content: this.form.content,
           },
           update: (store, { data: { CreateComment } }) => {
             const data = store.readQuery({
-              query: PostCommentsQuery(this.$i18n),
+              query: PostQuery(this.$i18n),
               variables: { slug: this.post.slug },
             })
             data.Post[0].comments.push(CreateComment)
-            store.writeQuery({ query: PostCommentsQuery(this.$i18n), data })
+            store.writeQuery({ query: PostQuery(this.$i18n), data })
           },
         })
         .then(res => {
@@ -98,14 +97,16 @@ export default {
   apollo: {
     User: {
       query() {
-        return gql(`{
-          User(orderBy: slug_asc) {
-            id
-            slug
-            name
-            avatar
+        return gql`
+          {
+            User(orderBy: slug_asc) {
+              id
+              slug
+              name
+              avatar
+            }
           }
-        }`)
+        `
       },
       result(result) {
         this.users = result.data.User
diff --git a/webapp/components/comments/CommentList/CommentList.spec.js b/webapp/components/CommentList/CommentList.spec.js
similarity index 68%
rename from webapp/components/comments/CommentList/CommentList.spec.js
rename to webapp/components/CommentList/CommentList.spec.js
index 023974284..e1090475a 100644
--- a/webapp/components/comments/CommentList/CommentList.spec.js
+++ b/webapp/components/CommentList/CommentList.spec.js
@@ -1,5 +1,5 @@
 import { config, mount, createLocalVue } from '@vue/test-utils'
-import CommentList from '.'
+import CommentList from './CommentList'
 import Empty from '~/components/Empty'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
@@ -21,63 +21,52 @@ describe('CommentList.vue', () => {
   let store
   let wrapper
   let propsData
-  let data
-
-  propsData = {
-    post: {
-      id: 1,
-    },
-  }
-  store = new Vuex.Store({
-    getters: {
-      'auth/user': () => {
-        return {}
-      },
-    },
-  })
-  mocks = {
-    $t: jest.fn(),
-    $filters: {
-      truncate: a => a,
-    },
-    $apollo: {
-      queries: {
-        Post: {
-          refetch: jest.fn(),
-        },
-      },
-    },
-  }
-  data = () => {
-    return {
-      comments: [],
-    }
-  }
 
   describe('shallowMount', () => {
+    beforeEach(() => {
+      propsData = {
+        post: {
+          id: 1,
+          comments: [{ id: 'comment134', contentExcerpt: 'this is a comment' }],
+        },
+      }
+      store = new Vuex.Store({
+        getters: {
+          'auth/user': () => {
+            return {}
+          },
+        },
+      })
+      mocks = {
+        $t: jest.fn(),
+        $filters: {
+          truncate: a => a,
+        },
+        $apollo: {
+          queries: {
+            Post: {
+              refetch: jest.fn(),
+            },
+          },
+        },
+      }
+    })
+
     const Wrapper = () => {
       return mount(CommentList, {
         store,
         mocks,
         localVue,
         propsData,
-        data,
       })
     }
 
     beforeEach(() => {
       wrapper = Wrapper()
-      wrapper.setData({
-        comments: [
-          {
-            id: 'c1',
-            contentExcerpt: 'this is a comment',
-          },
-        ],
-      })
     })
 
     it('displays a message icon when there are no comments to display', () => {
+      propsData.post.comments = []
       expect(Wrapper().findAll(Empty)).toHaveLength(1)
     })
 
diff --git a/webapp/components/comments/CommentList/index.vue b/webapp/components/CommentList/CommentList.vue
similarity index 53%
rename from webapp/components/comments/CommentList/index.vue
rename to webapp/components/CommentList/CommentList.vue
index e1996809f..2ae670bf4 100644
--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/CommentList/CommentList.vue
@@ -4,25 +4,25 @@
       <span>
         <ds-icon name="comments" />
         <ds-tag
-          v-if="comments"
+          v-if="post.comments.length"
           style="margin-top: -4px; margin-left: -12px; position: absolute;"
           color="primary"
           size="small"
           round
         >
-          {{ comments.length }}
+          {{ post.comments.length }}
         </ds-tag>
         &nbsp; Comments
       </span>
     </h3>
     <ds-space margin-bottom="large" />
-    <div v-if="comments && comments.length" id="comments" class="comments">
+    <div v-if="post.comments && post.comments.length" id="comments" class="comments">
       <comment
-        v-for="(comment, index) in comments"
+        v-for="(comment, index) in post.comments"
         :key="comment.id"
         :comment="comment"
         :post="post"
-        @deleteComment="comments.splice(index, 1)"
+        @deleteComment="post.comments.splice(index, 1)"
       />
     </div>
     <hc-empty v-else name="empty" icon="messages" />
@@ -31,7 +31,6 @@
 <script>
 import Comment from '~/components/Comment.vue'
 import HcEmpty from '~/components/Empty.vue'
-import PostCommentsQuery from '~/graphql/PostCommentsQuery.js'
 
 export default {
   components: {
@@ -41,29 +40,5 @@ export default {
   props: {
     post: { type: Object, default: () => {} },
   },
-  data() {
-    return {
-      comments: [],
-    }
-  },
-  watch: {
-    Post(post) {
-      const [first] = post
-      this.comments = (first && first.comments) || []
-    },
-  },
-  apollo: {
-    Post: {
-      query() {
-        return PostCommentsQuery(this.$i18n)
-      },
-      variables() {
-        return {
-          slug: this.post.slug,
-        }
-      },
-      fetchPolicy: 'cache-and-network',
-    },
-  },
 }
 </script>
diff --git a/webapp/components/DeleteData/DeleteData.spec.js b/webapp/components/DeleteData/DeleteData.spec.js
index 139316ed2..73ca985fa 100644
--- a/webapp/components/DeleteData/DeleteData.spec.js
+++ b/webapp/components/DeleteData/DeleteData.spec.js
@@ -48,7 +48,7 @@ describe('DeleteData.vue', () => {
     }
     getters = {
       'auth/user': () => {
-        return { id: 'u343', name: deleteAccountName, contributionsCount: 2, commentsCount: 3 }
+        return { id: 'u343', name: deleteAccountName, contributionsCount: 2, commentedCount: 3 }
       },
     }
     actions = { 'auth/logout': jest.fn() }
diff --git a/webapp/components/DeleteData/DeleteData.vue b/webapp/components/DeleteData/DeleteData.vue
index 293e65221..f6e6d47f0 100644
--- a/webapp/components/DeleteData/DeleteData.vue
+++ b/webapp/components/DeleteData/DeleteData.vue
@@ -30,12 +30,12 @@
               }}
             </label>
             <ds-space margin-bottom="small" />
-            <label v-if="currentUser.commentsCount" class="checkbox-container">
+            <label v-if="currentUser.commentedCount" class="checkbox-container">
               <input type="checkbox" v-model="deleteComments" />
               <span class="checkmark"></span>
               {{
-                $t('settings.deleteUserAccount.commentsCount', {
-                  count: currentUser.commentsCount,
+                $t('settings.deleteUserAccount.commentedCount', {
+                  count: currentUser.commentedCount,
                 })
               }}
             </label>
diff --git a/webapp/components/comments/EditCommentForm/EditCommentForm.vue b/webapp/components/EditCommentForm/EditCommentForm.vue
similarity index 100%
rename from webapp/components/comments/EditCommentForm/EditCommentForm.vue
rename to webapp/components/EditCommentForm/EditCommentForm.vue
diff --git a/webapp/components/PostCard/PostCard.story.js b/webapp/components/PostCard/PostCard.story.js
index 8d7691c22..7cd579140 100644
--- a/webapp/components/PostCard/PostCard.story.js
+++ b/webapp/components/PostCard/PostCard.story.js
@@ -24,7 +24,7 @@ const post = {
     deleted: false,
     contributionsCount: 25,
     shoutedCount: 5,
-    commentsCount: 39,
+    commentedCount: 39,
     followedByCount: 2,
     followedByCurrentUser: true,
     location: null,
@@ -38,7 +38,7 @@ const post = {
     ],
     __typename: 'User',
   },
-  commentsCount: 12,
+  commentedCount: 12,
   categories: [],
   shoutedCount: 421,
   __typename: 'Post',
diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index 3fee24176..2ec8cf606 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -48,9 +48,9 @@
             </span>
             &nbsp;
             <!-- Comments Count -->
-            <span :style="{ opacity: post.commentsCount ? 1 : 0.5 }">
+            <span :style="{ opacity: post.commentedCount ? 1 : 0.5 }">
               <ds-icon name="comments" />
-              <small>{{ post.commentsCount }}</small>
+              <small>{{ post.commentedCount }}</small>
             </span>
             <!-- Menu -->
             <content-menu
diff --git a/webapp/components/SearchInput.spec.js b/webapp/components/SearchInput.spec.js
index bf44b906b..acba82f08 100644
--- a/webapp/components/SearchInput.spec.js
+++ b/webapp/components/SearchInput.spec.js
@@ -122,7 +122,7 @@ describe('SearchInput.vue', () => {
                 name: 'Trick',
                 slug: 'trick',
               },
-              commentsCount: 0,
+              commentedCount: 0,
               createdAt: '2019-03-13T11:00:20.835Z',
               id: 'p10',
               label: 'Eos aut illo omnis quis eaque et iure aut.',
diff --git a/webapp/components/SearchInput.vue b/webapp/components/SearchInput.vue
index 098b30610..c93e65d61 100644
--- a/webapp/components/SearchInput.vue
+++ b/webapp/components/SearchInput.vue
@@ -46,7 +46,7 @@
                   <ds-flex-item>
                     <ds-text size="small" color="softer" class="search-meta">
                       <span style="text-align: right;">
-                        <b>{{ option.commentsCount }}</b>
+                        <b>{{ option.commentedCount }}</b>
                         <ds-icon name="comments" />
                       </span>
                       <span style="width: 36px; display: inline-block; text-align: right;">
diff --git a/webapp/components/User/index.vue b/webapp/components/User/index.vue
index 7841fe596..b4e8fae66 100644
--- a/webapp/components/User/index.vue
+++ b/webapp/components/User/index.vue
@@ -64,8 +64,8 @@
           <ds-flex-item class="ds-tab-nav-item">
             <ds-space margin="small">
               <ds-number
-                :count="user.commentsCount"
-                :label="$t('common.comment', null, user.commentsCount)"
+                :count="user.commentedCount"
+                :label="$t('common.comment', null, user.commentedCount)"
               />
             </ds-space>
           </ds-flex-item>
diff --git a/webapp/graphql/CommentMutations.js b/webapp/graphql/CommentMutations.js
index 6b0f653fc..bf4fc33ea 100644
--- a/webapp/graphql/CommentMutations.js
+++ b/webapp/graphql/CommentMutations.js
@@ -1,6 +1,6 @@
 import gql from 'graphql-tag'
 
-export default () => {
+export default i18n => {
   return {
     CreateComment: gql`
       mutation($postId: ID!, $content: String!) {
@@ -8,15 +8,26 @@ export default () => {
           id
           contentExcerpt
           content
+          createdAt
+          disabled
+          deleted
           author {
             id
             slug
             name
             avatar
+            disabled
+            deleted
+            shoutedCount
+            contributionsCount
+            commentedCount
+            followedByCount
+            followedByCurrentUser
+            badges {
+              id
+              icon
+            }
           }
-          createdAt
-          deleted
-          disabled
         }
       }
     `,
@@ -24,8 +35,19 @@ export default () => {
       mutation($content: String!, $id: ID!) {
         UpdateComment(content: $content, id: $id) {
           id
-          content
           contentExcerpt
+          content
+          createdAt
+          disabled
+          deleted
+          author {
+            id
+            slug
+            name
+            avatar
+            disabled
+            deleted
+          }
         }
       }
     `,
diff --git a/webapp/graphql/CommentQuery.js b/webapp/graphql/CommentQuery.js
index 4d82165f0..c2daaa943 100644
--- a/webapp/graphql/CommentQuery.js
+++ b/webapp/graphql/CommentQuery.js
@@ -17,7 +17,7 @@ export default app => {
           deleted
           shoutedCount
           contributionsCount
-          commentsCount
+          commentedCount
           followedByCount
           followedByCurrentUser
           location {
diff --git a/webapp/graphql/PostCommentsQuery.js b/webapp/graphql/PostCommentsQuery.js
deleted file mode 100644
index 08c8ea4ea..000000000
--- a/webapp/graphql/PostCommentsQuery.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import gql from 'graphql-tag'
-
-export default i18n => {
-  const lang = i18n.locale().toUpperCase()
-  return gql(`
-    query Post($slug: String!) {
-      Post(slug: $slug) {
-        comments(orderBy: createdAt_asc) {
-          id
-          contentExcerpt
-          content
-          createdAt
-          disabled
-          deleted
-          author {
-            id
-            slug
-            name
-            avatar
-            disabled
-            deleted
-            shoutedCount
-            contributionsCount
-            commentsCount
-            followedByCount
-            followedByCurrentUser
-            location {
-              name: name${lang}
-            }
-            badges {
-              id
-              icon
-            }
-          }
-        }
-      }
-    }
-  `)
-}
diff --git a/webapp/graphql/PostQuery.js b/webapp/graphql/PostQuery.js
index f5da8dc56..13898200a 100644
--- a/webapp/graphql/PostQuery.js
+++ b/webapp/graphql/PostQuery.js
@@ -22,7 +22,7 @@ export default i18n => {
             deleted
             shoutedCount
             contributionsCount
-            commentsCount
+            commentedCount
             followedByCount
             followedByCurrentUser
             location {
@@ -36,10 +36,10 @@ export default i18n => {
           tags {
             id
           }
-          commentsCount
-          comments(orderBy: createdAt_desc) {
+          comments(orderBy: createdAt_asc) {
             id
             contentExcerpt
+            content
             createdAt
             disabled
             deleted
@@ -52,7 +52,7 @@ export default i18n => {
               deleted
               shoutedCount
               contributionsCount
-              commentsCount
+              commentedCount
               followedByCount
               followedByCurrentUser
               location {
@@ -99,7 +99,7 @@ export const filterPosts = i18n => {
         deleted
         contributionsCount
         shoutedCount
-        commentsCount
+        commentedCount
         followedByCount
         followedByCurrentUser
         location {
@@ -110,7 +110,6 @@ export const filterPosts = i18n => {
           icon
         }
       }
-      commentsCount
       categories {
         id
         name
diff --git a/webapp/graphql/UserProfile/User.js b/webapp/graphql/User.js
similarity index 93%
rename from webapp/graphql/UserProfile/User.js
rename to webapp/graphql/User.js
index 9febce142..7771481a6 100644
--- a/webapp/graphql/UserProfile/User.js
+++ b/webapp/graphql/User.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export default i18n => {
   const lang = i18n.locale().toUpperCase()
-  return gql(`
+  return gql`
     query User($id: ID!) {
       User(id: $id) {
         id
@@ -35,7 +35,7 @@ export default i18n => {
           followedByCount
           followedByCurrentUser
           contributionsCount
-          commentsCount
+          commentedCount
           badges {
             id
             icon
@@ -57,7 +57,7 @@ export default i18n => {
           followedByCount
           followedByCurrentUser
           contributionsCount
-          commentsCount
+          commentedCount
           badges {
             id
             icon
@@ -66,12 +66,11 @@ export default i18n => {
             name: name${lang}
           }
         }
-        contributionsCount
         socialMedia {
           id
           url
         }
       }
     }
-  `)
+  `
 }
diff --git a/webapp/graphql/UserProfile/Post.js b/webapp/graphql/UserProfile/Post.js
deleted file mode 100644
index c33572a9e..000000000
--- a/webapp/graphql/UserProfile/Post.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import gql from 'graphql-tag'
-
-export default i18n => {
-  const lang = i18n.locale().toUpperCase()
-  return gql(`
-    query Post($filter: _PostFilter, $first: Int, $offset: Int) {
-      Post(filter: $filter, first: $first, offset: $offset, orderBy: createdAt_desc) {
-        id
-        slug
-        title
-        contentExcerpt
-        shoutedCount
-        commentsCount
-        deleted
-        image
-        createdAt
-        disabled
-        deleted
-        categories {
-          id
-          name
-          icon
-        }
-        author {
-          id
-          slug
-          avatar
-          name
-          disabled
-          deleted
-          location {
-            name: name${lang}
-          }
-        }
-      }
-    }
-  `)
-}
diff --git a/webapp/graphql/settings/BlockedUsers.js b/webapp/graphql/settings/BlockedUsers.js
index e47355b18..8f882f8ad 100644
--- a/webapp/graphql/settings/BlockedUsers.js
+++ b/webapp/graphql/settings/BlockedUsers.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const BlockedUsers = () => {
-  return gql(`
+  return gql`
     {
       blockedUsers {
         id
@@ -13,27 +13,31 @@ export const BlockedUsers = () => {
         deleted
       }
     }
-  `)
+  `
 }
 
 export const Block = () => {
-  return gql(`mutation($id:ID!) {
-    block(id: $id) {
-      id
-      name
-      isBlocked
-      followedByCurrentUser
+  return gql`
+    mutation($id: ID!) {
+      block(id: $id) {
+        id
+        name
+        isBlocked
+        followedByCurrentUser
+      }
     }
-  }`)
+  `
 }
 
 export const Unblock = () => {
-  return gql(`mutation($id:ID!) {
-    unblock(id: $id) {
-      id
-      name
-      isBlocked
-      followedByCurrentUser
+  return gql`
+    mutation($id: ID!) {
+      unblock(id: $id) {
+        id
+        name
+        isBlocked
+        followedByCurrentUser
+      }
     }
-  }`)
+  `
 }
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 33c8e37c5..14980a112 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -171,7 +171,7 @@
     "deleteUserAccount": {
       "name": "Daten löschen",
       "contributionsCount": "Meine {count} Beiträge löschen",
-      "commentsCount": "Meine {count} Kommentare löschen",
+      "commentedCount": "Meine {count} Kommentare löschen",
       "accountDescription": "Sei dir bewusst, dass deine Beiträge und Kommentare für unsere Community wichtig sind. Wenn du sie trotzdem löschen möchtest, musst du sie unten markieren.",
       "accountWarning": "Dein Konto, deine Beiträge oder Kommentare kannst du nach dem Löschen <b>WEDER VERWALTEN NOCH WIEDERHERSTELLEN!</b>",
       "success": "Konto erfolgreich gelöscht!",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 664cbaff2..59323fd5a 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -171,7 +171,7 @@
     "deleteUserAccount": {
       "name": "Delete data",
       "contributionsCount": "Delete my {count} posts",
-      "commentsCount": "Delete my {count} comments",
+      "commentedCount": "Delete my {count} comments",
       "accountDescription": "Be aware that your Post and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
       "accountWarning": "You <b>CAN'T MANAGE</b> and <b>CAN'T RECOVER</b> your Account, Posts, or Comments after deleting your account!",
       "success": "Account successfully deleted!",
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index 3f6746adf..ed5f049ab 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -121,7 +121,7 @@
     "deleteUserAccount": {
       "name": "Usuń dane",
       "contributionsCount": "Usuń {count} moich postów",
-      "commentsCount": "Usuń {count} moich komentarzy",
+      "commentedCount": "Usuń {count} moich komentarzy",
       "accountDescription": "Be aware that your Post and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
       "accountWarning": "Po usunięcie Twojego konta, nie możesz <b>ZARZĄDZAĆ</b> ani <b>ODZYSKAĆ</b> danych, wpisów oraz komentarzy!",
       "success": "Konto zostało usunięte",
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 7566ce791..e8d68a561 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -96,7 +96,7 @@ export default {
           label: this.$t('sorting.commented'),
           value: 'Commented',
           icons: 'comment',
-          order: 'commentsCount_desc',
+          order: 'commentedCount_desc',
         },
       ],
     }
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 6d3eb0259..1a7e84789 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -81,10 +81,10 @@ import HcTag from '~/components/Tag'
 import ContentMenu from '~/components/ContentMenu'
 import HcUser from '~/components/User'
 import HcShoutButton from '~/components/ShoutButton.vue'
-import HcCommentForm from '~/components/comments/CommentForm'
-import HcCommentList from '~/components/comments/CommentList'
+import HcCommentForm from '~/components/CommentForm/CommentForm'
+import HcCommentList from '~/components/CommentList/CommentList'
 import { postMenuModalsData, deletePostMutation } from '~/components/utils/PostHelpers'
-import PostQuery from '~/graphql/PostQuery.js'
+import PostQuery from '~/graphql/PostQuery'
 import HcEmotions from '~/components/Emotions/Emotions'
 
 export default {
@@ -122,29 +122,6 @@ export default {
       this.title = this.post.title
     },
   },
-  async asyncData(context) {
-    const {
-      params,
-      error,
-      app: { apolloProvider, $i18n },
-    } = context
-    const client = apolloProvider.defaultClient
-    const query = PostQuery($i18n)
-    const variables = { slug: params.slug }
-    const {
-      data: { Post },
-    } = await client.query({ query, variables })
-    if (Post.length <= 0) {
-      // TODO: custom 404 error page with translations
-      const message = 'This post could not be found'
-      return error({ statusCode: 404, message })
-    }
-    const [post] = Post
-    return {
-      post,
-      title: post.title,
-    }
-  },
   mounted() {
     setTimeout(() => {
       // NOTE: quick fix for jumping flexbox implementation
@@ -175,6 +152,19 @@ export default {
       }
     },
   },
+  apollo: {
+    Post: {
+      query() {
+        return PostQuery(this.$i18n)
+      },
+      variables() {
+        return {
+          slug: this.$route.params.slug,
+        }
+      },
+      fetchPolicy: 'cache-and-network',
+    },
+  },
 }
 </script>
 
@@ -187,7 +177,6 @@ export default {
   }
 
   .post-card {
-    // max-width: 800px;
     margin: auto;
 
     .comments {
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index ef442b7d6..ab711e101 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -91,7 +91,7 @@ export default {
                 slug
                 contentExcerpt
                 shoutedCount
-                commentsCount
+                commentedCount
                 categories {
                   id
                   name
@@ -105,7 +105,7 @@ export default {
                   contributionsCount
                   followedByCount
                   followedByCurrentUser
-                  commentsCount
+                  commentedCount
                   location {
                     name: name${this.$i18n.locale().toUpperCase()}
                   }
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 540e6bdc8..6e4baba4d 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -254,9 +254,9 @@ import HcEmpty from '~/components/Empty.vue'
 import ContentMenu from '~/components/ContentMenu'
 import HcUpload from '~/components/Upload'
 import HcAvatar from '~/components/Avatar/Avatar.vue'
-import PostQuery from '~/graphql/UserProfile/Post.js'
-import UserQuery from '~/graphql/UserProfile/User.js'
-import { Block, Unblock } from '~/graphql/settings/BlockedUsers.js'
+import { filterPosts } from '~/graphql/PostQuery'
+import UserQuery from '~/graphql/User'
+import { Block, Unblock } from '~/graphql/settings/BlockedUsers'
 
 const tabToFilterMapping = ({ tab, id }) => {
   return {
@@ -401,7 +401,7 @@ export default {
   apollo: {
     Post: {
       query() {
-        return PostQuery(this.$i18n)
+        return filterPosts(this.$i18n)
       },
       variables() {
         return {
diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 6185a38cf..f756fc2c9 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -80,7 +80,7 @@ export const actions = {
           about
           locationName
           contributionsCount
-          commentsCount
+          commentedCount
           socialMedia {
             id
             url
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 17e764537..2d9e3ffdc 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -88,7 +88,7 @@ export const actions = {
               deleted
               contributionsCount
               shoutedCount
-              commentsCount
+              commentedCount
               followedByCount
               followedByCurrentUser
               location {
@@ -99,7 +99,6 @@ export const actions = {
                 icon
               }
             }
-            commentsCount
             categories {
               id
               name
diff --git a/webapp/store/search.js b/webapp/store/search.js
index c5ed9523a..0d0172a98 100644
--- a/webapp/store/search.js
+++ b/webapp/store/search.js
@@ -45,15 +45,14 @@ export const actions = {
     commit('SET_QUICK_PENDING', true)
     await this.app.apolloProvider.defaultClient
       .query({
-        query: gql(`
+        query: gql`
           query findPosts($query: String!) {
             findPosts(query: $query, limit: 10) {
               id
               slug
               label: title
-              value: title,
+              value: title
               shoutedCount
-              commentsCount
               createdAt
               author {
                 id
@@ -62,7 +61,7 @@ export const actions = {
               }
             }
           }
-        `),
+        `,
         variables: {
           query: value.replace(/\s/g, '~ ') + '~',
         },