diff --git a/models/server-core/src/index.ts b/models/server-core/src/index.ts
index 1456bc411b..0a92306c04 100644
--- a/models/server-core/src/index.ts
+++ b/models/server-core/src/index.ts
@@ -63,7 +63,7 @@ export class TObjectDDParticipant extends TClass implements ObjectDDParticipant
 @Mixin(serverCore.mixin.SearchPresenter, core.class.Class)
 export class TSearchPresenter extends TClass implements SearchPresenter {
   searchConfig!: ClassSearchConfig
-  getSearchObjectId!: Resource<SearchPresenterFunc>
+  getSearchShortTitle!: Resource<SearchPresenterFunc>
   getSearchTitle!: Resource<SearchPresenterFunc>
 }
 
diff --git a/packages/text-editor/src/components/MentionPopup.svelte b/packages/text-editor/src/components/MentionPopup.svelte
index 1f7cf020eb..d285afc93f 100644
--- a/packages/text-editor/src/components/MentionPopup.svelte
+++ b/packages/text-editor/src/components/MentionPopup.svelte
@@ -164,39 +164,43 @@
   $: updateItems(query)
 </script>
 
-<form class="antiPopup mentionPoup" on:keydown={onKeyDown} use:resizeObserver={() => dispatch('changeSize')}>
-  <div class="ap-scroll" bind:this={scrollContainer}>
-    <div class="ap-box">
-      {#if items.length === 0 && query !== ''}
-        <div class="noResults"><Label label={presentation.string.NoResults} /></div>
-      {/if}
-      <!-- svelte-ignore a11y-click-events-have-key-events -->
-      <ListView bind:this={list} bind:selection count={items.length}>
-        <svelte:fragment slot="category" let:item={num}>
-          {@const item = items[num]}
-          {#if item.num === 0}
-            <div class="mentonCategory">
-              <Label label={item.category.title} />
-            </div>
-          {/if}
-        </svelte:fragment>
-        <svelte:fragment slot="item" let:item={num}>
-          {@const item = items[num]}
-          {@const doc = item.item}
-          <div
-            class="ap-menuItem withComp"
-            on:click={() => {
-              dispatchItem(doc)
-            }}
-          >
-            <MentionResult value={doc} />
-          </div>
-        </svelte:fragment>
-      </ListView>
+{#if (items.length === 0 && query !== '') || items.length > 0}
+  <form class="antiPopup mentionPoup" on:keydown={onKeyDown} use:resizeObserver={() => dispatch('changeSize')}>
+    <div class="ap-scroll" bind:this={scrollContainer}>
+      <div class="ap-box">
+        {#if items.length === 0 && query !== ''}
+          <div class="noResults"><Label label={presentation.string.NoResults} /></div>
+        {/if}
+        {#if items.length > 0}
+          <!-- svelte-ignore a11y-click-events-have-key-events -->
+          <ListView bind:this={list} bind:selection count={items.length}>
+            <svelte:fragment slot="category" let:item={num}>
+              {@const item = items[num]}
+              {#if item.num === 0}
+                <div class="mentonCategory">
+                  <Label label={item.category.title} />
+                </div>
+              {/if}
+            </svelte:fragment>
+            <svelte:fragment slot="item" let:item={num}>
+              {@const item = items[num]}
+              {@const doc = item.item}
+              <div
+                class="ap-menuItem withComp"
+                on:click={() => {
+                  dispatchItem(doc)
+                }}
+              >
+                <MentionResult value={doc} />
+              </div>
+            </svelte:fragment>
+          </ListView>
+        {/if}
+      </div>
     </div>
-  </div>
-  <div class="ap-space x2" />
-</form>
+    <div class="ap-space x2" />
+  </form>
+{/if}
 
 <style lang="scss">
   .noResults {
diff --git a/server/core/src/mapper.ts b/server/core/src/mapper.ts
index dfec97e499..ba606885d2 100644
--- a/server/core/src/mapper.ts
+++ b/server/core/src/mapper.ts
@@ -85,7 +85,7 @@ export async function updateDocWithPresenter (hierarchy: Hierarchy, doc: Indexed
     props.push({
       name: 'searchShortTitle',
       config: searchPresenter.searchConfig.shortTitle,
-      provider: searchPresenter.getSearchObjectId
+      provider: searchPresenter.getSearchShortTitle
     })
   }
 
diff --git a/server/core/src/types.ts b/server/core/src/types.ts
index b152f6962b..45aad7358f 100644
--- a/server/core/src/types.ts
+++ b/server/core/src/types.ts
@@ -365,6 +365,6 @@ export interface ClassSearchConfig {
  */
 export interface SearchPresenter extends Class<Doc> {
   searchConfig: ClassSearchConfig
-  getSearchObjectId?: Resource<SearchPresenterFunc>
+  getSearchShortTitle?: Resource<SearchPresenterFunc>
   getSearchTitle?: Resource<SearchPresenterFunc>
 }
diff --git a/server/elastic/src/adapter.ts b/server/elastic/src/adapter.ts
index db86af80de..ceb6188af7 100644
--- a/server/elastic/src/adapter.ts
+++ b/server/elastic/src/adapter.ts
@@ -128,7 +128,12 @@ class ElasticAdapter implements FullTextAdapter {
         size: options.limit ?? DEFAULT_LIMIT
       }
 
-      const filter = []
+      const filter: any = [
+        {
+          exists: { field: 'searchTitle' }
+        }
+      ]
+
       if (query.spaces !== undefined) {
         filter.push({
           terms: { 'space.keyword': query.spaces }