diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index be5c89549..b37a4abd5 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -48,7 +48,7 @@ export default {
     },
     findPosts: async (object, params, context, resolveInfo) => {
       params = await filterForBlockedUsers(params, context)
-      return neo4jgraphql(object, params, context, resolveInfo, true)
+      return neo4jgraphql(object, params, context, resolveInfo)
     },
     profilePagePosts: async (object, params, context, resolveInfo) => {
       params = await filterForBlockedUsers(params, context)
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 4ecca74e1..514bccb9b 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -226,8 +226,6 @@ type Query {
   PostsEmotionsCountByEmotion(postId: ID!, data: _EMOTEDInput!): Int!
   PostsEmotionsByCurrentUser(postId: ID!): [String]
   profilePagePosts(filter: _PostFilter, first: Int, offset: Int, orderBy: [_PostOrdering]): [Post]
-  isLoggedIn: Boolean!
-  currentUser: User
   findPosts(query: String!, limit: Int = 10, filter: _PostFilter): [Post]!
     @cypher(
       statement: """
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index bc76bbcff..8f3011a92 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -161,6 +161,7 @@ type Query {
   ): [User]
 
   blockedUsers: [User]
+  isLoggedIn: Boolean!
     currentUser: User
     findUsers(query: String!,limit: Int = 10, filter: _UserFilter): [User]!
     @cypher(
diff --git a/webapp/components/SearchInput/SearchInput.vue b/webapp/components/SearchInput/SearchInput.vue
index 01da32537..a7cc6659c 100644
--- a/webapp/components/SearchInput/SearchInput.vue
+++ b/webapp/components/SearchInput/SearchInput.vue
@@ -44,8 +44,8 @@
                 </ds-heading>
               </ds-flex-item>
             </ds-flex>
-            <ds-flex v-else-if="option.__typename === 'User'">
-              <ds-flex-item class="search-option">
+            <ds-flex v-if="option.__typename === 'User'">
+	      <ds-flex-item class="search-option" :class="{'extra-space': isFirstOfType(option)}">
                 <ds-avatar class="avatar" name="option.name" image="option.avatar" />
                 <div>
                   <ds-text class="userinfo">
@@ -57,7 +57,7 @@
                 </ds-text>
               </ds-flex-item>
             </ds-flex>
-            <ds-flex v-else>
+            <ds-flex v-if="option.__typename === 'Post'">
               <ds-flex-item class="search-option-label">
                 <ds-text>{{ option.title | truncate(70) }}</ds-text>
               </ds-flex-item>
@@ -136,11 +136,11 @@ export default {
     },
   },
   methods: {
-    async query(value) {
-      if (isEmpty(value) || value.length < 3) {
-        this.clear()
-        return
-      }
+      async query(value) {
+	if (isEmpty(value) || value.length < 3) {
+          this.clear()
+          return
+        }
       this.$emit('search', value)
     },
     handleInput(e) {
@@ -211,105 +211,109 @@ export default {
 </script>
 
 <style lang="scss">
-.search {
-  display: flex;
-  align-self: center;
-  width: 100%;
-  position: relative;
-  $padding-left: $space-x-small;
-  .search-option-label {
-    align-self: center;
-    padding-left: $padding-left;
-  }
-  .search-option-meta {
-    align-self: center;
-    .ds-flex {
-      flex-direction: column;
-    }
-  }
-  &,
-  .ds-select-dropdown {
-    transition: box-shadow 100ms;
-    max-height: 70vh;
-  }
-  &.is-open {
-    .ds-select-dropdown {
-      box-shadow: $box-shadow-x-large;
-    }
-  }
-  .ds-select-dropdown-message {
-    opacity: 0.5;
-    padding-left: $padding-left;
-  }
-  .search-clear-btn {
-    right: 0;
-    z-index: 10;
-    position: absolute;
-    height: 100%;
-    width: 36px;
-    cursor: pointer;
-  }
-  .search-meta {
-    float: right;
-    padding-top: 2px;
-    white-space: nowrap;
-    word-wrap: none;
-    .base-icon {
-      vertical-align: sub;
-    }
-  }
-  .ds-select {
-    z-index: $z-index-dropdown + 1;
-  }
-  .ds-select-option-hover {
-    .ds-text-size-small,
-    .ds-text-size-small-x {
-      color: $text-color-soft;
-    }
-  }
-  .field {
-    width: 100%;
-    display: flex;
-    align-items: center;
-  }
-  .control {
-    width: 100%;
-  }
-  .search-option-heading {
-    font-weight: bold;
-    cursor: default;
-    background-color: white;
-    margin: -8px;
-    padding: 8px;
-  }
-  .avatar {
-    display: inline-block;
-    float: left;
-    margin-right: 4px;
-    height: 100%;
-    vertical-align: middle;
-  }
-  .userinfo {
-    display: flex;
-    align-items: center;
-    > .ds-text {
-      display: flex;
-      align-items: center;
-      margin-left: $space-xx-small;
-    }
-  }
-  .user {
-    white-space: nowrap;
-    position: relative;
-    display: flex;
-    align-items: center;
-    &:hover,
-    &.active {
-      z-index: 999;
-    }
-  }
-  .username {
-    color: #17b53f;
-  }
-}
+ .search {
+     display: flex;
+     align-self: center;
+     width: 100%;
+     position: relative;
+     $padding-left: $space-x-small;
+     .search-option-label {
+	 align-self: center;
+	 padding-left: $padding-left;
+     }
+     .search-option-meta {
+	 align-self: center;
+	 .ds-flex {
+	     flex-direction: column;
+	 }
+     }
+     &,
+     .ds-select-dropdown {
+	 transition: box-shadow 100ms;
+	 max-height: 70vh;
+     }
+     &.is-open {
+	 .ds-select-dropdown {
+	     box-shadow: $box-shadow-x-large;
+	 }
+     }
+     .ds-select-dropdown-message {
+	 opacity: 0.5;
+	 padding-left: $padding-left;
+     }
+     .search-clear-btn {
+	 right: 0;
+	 z-index: 10;
+	 position: absolute;
+	 height: 100%;
+	 width: 36px;
+	 cursor: pointer;
+     }
+     .search-meta {
+	 float: right;
+	 padding-top: 2px;
+	 white-space: nowrap;
+	 word-wrap: none;
+	 .base-icon {
+	     vertical-align: sub;
+	 }
+     }
+     .ds-select {
+	 z-index: $z-index-dropdown + 1;
+     }
+     .ds-select-option-hover {
+	 .ds-text-size-small,
+	 .ds-text-size-small-x {
+	     color: $text-color-soft;
+	 }
+     }
+     .field {
+	 width: 100%;
+	 display: flex;
+	 align-items: center;
+     }
+     .control {
+	 width: 100%;
+     }
+     .search-option-heading {
+	 font-weight: bold;
+	 cursor: default;
+	 background-color: white;
+	 margin: -8px;
+	 padding: 8px;
+     }
+     .avatar {
+	 display: inline-block;
+	 float: left;
+	 margin-right: 4px;
+	 height: 100%;
+	 vertical-align: middle;
+     }
+     .userinfo {
+	 display: flex;
+	 align-items: center;
+	 > .ds-text {
+	     display: flex;
+	     align-items: center;
+	     margin-left: $space-xx-small;
+	 }
+     }
+     .user {
+	 white-space: nowrap;
+	 position: relative;
+	 display: flex;
+	 align-items: center;
+	 &:hover,
+	 &.active {
+	     z-index: 999;
+	 }
+     }
+     .username {
+	 color: #17b53f;
+     }
+     .extra-space {
+	 margin-top: 8px;
+	 padding-top: 4px;
+     }
+ }
 </style>