From 76e71712e69a8c3c0aa581de556c74ad5757e76c Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Thu, 20 Apr 2023 17:11:22 +0700
Subject: [PATCH] TSK-1237: Improve full text indexer (#3025)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 .gitignore                                    |   1 +
 .vscode/launch.json                           |   3 +-
 dev/generator/src/issues.ts                   |   2 +-
 dev/generator/src/recruit.ts                  |   2 +-
 dev/tool/src/clean.ts                         |   2 +-
 models/core/src/core.ts                       |  20 ++-
 models/core/src/index.ts                      |  29 +++-
 models/gmail/src/index.ts                     |   4 +
 models/recruit/src/index.ts                   |   6 +-
 models/telegram/src/index.ts                  |   4 +
 packages/core/src/classes.ts                  |   5 +-
 packages/core/src/client.ts                   |  19 ++-
 packages/core/src/component.ts                |   2 +
 packages/core/src/measurements/metrics.ts     |  77 +++++++--
 packages/core/src/storage.ts                  |   3 +
 packages/core/src/utils.ts                    |   6 +-
 packages/model/src/dsl.ts                     |   7 +
 .../profiles/default/tsconfig.json            |   3 +-
 .../platform-rig/profiles/ui/tsconfig.json    |   1 +
 packages/platform/src/event.ts                |   5 +-
 .../presentation/src/components/Card.svelte   |   2 +-
 .../components/IndexedDocumentContent.svelte  |  11 +-
 .../components/IndexedDocumentPreview.svelte  |   2 +-
 .../src/components/PDFViewer.svelte           |   3 -
 packages/query/src/index.ts                   |  24 ++-
 .../ui/src/components/internal/Root.svelte    |  26 ++-
 .../src/components/internal/icons/WiFi.svelte |   7 +-
 packages/ui/src/plugin.ts                     |   5 +-
 packages/ui/src/utils.ts                      |   6 +
 .../presenters/ChecklistsPresenter.svelte     |  21 ++-
 .../board-resources/src/utils/BoardUtils.ts   |   2 +-
 .../EditChannelDescriptionAttachments.svelte  |   3 +-
 .../src/components/Thread.svelte              |   3 +-
 plugins/client-resources/src/connection.ts    |  15 ++
 plugins/client/src/index.ts                   |   3 +
 .../typeEditors/EnumTypeEditor.svelte         |   4 +-
 .../SetParentIssueActionPopup.svelte          |   3 -
 .../src/components/Table.svelte               |   2 +-
 .../src/components/ServerStatistics.svelte    |  53 ++++++
 .../src/components/WorkbenchApp.svelte        |   2 +-
 plugins/workbench-resources/src/connect.ts    |  40 ++++-
 pods/collaborator/src/metrics.ts              |   4 +-
 pods/server/src/server.ts                     |   8 +-
 server-plugins/chunter-resources/src/index.ts |   2 +-
 server-plugins/openai/src/openai.ts           |  15 +-
 server/account/tsconfig.json                  |   2 +-
 server/core/src/adapter.ts                    |   6 +
 server/core/src/fulltext.ts                   |   5 +-
 server/core/src/indexer/field.ts              | 110 +++++-------
 server/core/src/indexer/fulltextPush.ts       | 122 +++++++++-----
 server/core/src/indexer/indexer.ts            | 157 ++++++++++++------
 server/core/src/indexer/summary.ts            | 113 ++++++++++---
 server/core/src/indexer/types.ts              |   9 +-
 server/core/src/indexer/utils.ts              |  35 +++-
 server/core/src/storage.ts                    |   7 +-
 server/elastic/src/adapter.ts                 |   4 +
 server/elastic/src/backup.ts                  |   3 +
 server/front/src/index.ts                     |  83 ++++-----
 server/mongo/src/storage.ts                   |  55 +++---
 server/server/src/metrics.ts                  |   4 +-
 server/server/src/minio.ts                    |   3 +
 server/translate/src/retranslate.ts           |   4 +-
 server/ws/src/server.ts                       |  63 +++++--
 63 files changed, 879 insertions(+), 373 deletions(-)
 create mode 100644 plugins/workbench-resources/src/components/ServerStatistics.svelte

diff --git a/.gitignore b/.gitignore
index 5a7f8e2dc4..3b283ba8e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,4 @@ tsdoc-metadata.json
 pods/front/dist
 *.cpuprofile
 *.pyc
+metrics.txt
diff --git a/.vscode/launch.json b/.vscode/launch.json
index fbc22b56fa..1f0ba715d9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -37,7 +37,8 @@
         "ELASTIC_URL": "http://localhost:9200",
         "MONGO_URL": "mongodb://localhost:27017",
         "APM_SERVER_URL2": "http://localhost:8200",
-        "METRICS_CONSOLE": "true", // Show metrics in console evert 30 seconds.,
+        "METRICS_CONSOLE": "false",
+        "METRICS_FILE": "${workspaceRoot}/metrics.txt", // Show metrics in console evert 30 seconds.,
         "MINIO_ENDPOINT": "localhost",
         "MINIO_ACCESS_KEY": "minioadmin",
         "MINIO_SECRET_KEY": "minioadmin",
diff --git a/dev/generator/src/issues.ts b/dev/generator/src/issues.ts
index 7b3689587c..860d9ef219 100644
--- a/dev/generator/src/issues.ts
+++ b/dev/generator/src/issues.ts
@@ -66,7 +66,7 @@ export async function generateIssues (
   await connection.close()
   ctx.end()
 
-  console.info(metricsToString(ctx.metrics, 'Client'))
+  console.info(metricsToString(ctx.metrics, 'Client', 70))
 }
 
 async function genIssue (client: TxOperations, statuses: Ref<IssueStatus>[]): Promise<void> {
diff --git a/dev/generator/src/recruit.ts b/dev/generator/src/recruit.ts
index 2051901a61..f6f98beca9 100644
--- a/dev/generator/src/recruit.ts
+++ b/dev/generator/src/recruit.ts
@@ -73,7 +73,7 @@ export async function generateContacts (
   await connection.close()
   ctx.end()
 
-  console.info(metricsToString(ctx.metrics, 'Client'))
+  console.info(metricsToString(ctx.metrics, 'Client', 70))
 }
 
 async function genVacansyApplicants (
diff --git a/dev/tool/src/clean.ts b/dev/tool/src/clean.ts
index d15f3d7987..b28c1e3e80 100644
--- a/dev/tool/src/clean.ts
+++ b/dev/tool/src/clean.ts
@@ -152,7 +152,7 @@ export async function cleanRemovedTransactions (workspaceId: WorkspaceId, transa
       )
 
       count += toRemove.length
-      console.log('processed', count, removedDocs.total)
+      console.log('processed', count)
     }
 
     console.log('total docs with remove', count)
diff --git a/models/core/src/core.ts b/models/core/src/core.ts
index 3e3e048050..60a21d583f 100644
--- a/models/core/src/core.ts
+++ b/models/core/src/core.ts
@@ -59,12 +59,13 @@ import {
   Prop,
   TypeBoolean,
   TypeIntlString,
+  TypeRecord,
   TypeRef,
   TypeString,
   TypeTimestamp,
   UX
 } from '@hcengineering/model'
-import type { IntlString } from '@hcengineering/platform'
+import { getEmbeddedLabel, IntlString } from '@hcengineering/platform'
 import core from './component'
 
 // C O R E
@@ -256,14 +257,17 @@ export class TFulltextData extends TDoc implements FullTextData {
 
 @Model(core.class.DocIndexState, core.class.Doc, DOMAIN_DOC_INDEX_STATE)
 export class TDocIndexState extends TDoc implements DocIndexState {
-  objectClass!: Ref<Class<Doc>>
+  @Prop(TypeRef(core.class.Class), core.string.Class)
+  @Index(IndexKind.Indexed)
+  @Hidden()
+    objectClass!: Ref<Class<Doc>>
 
   @Prop(TypeRef(core.class.Doc), core.string.AttachedTo)
   @Index(IndexKind.Indexed)
   @Hidden()
     attachedTo?: Ref<Doc>
 
-  @Prop(TypeRef(core.class.Doc), core.string.AttachedToClass)
+  @Prop(TypeRef(core.class.Class), core.string.AttachedToClass)
   @Index(IndexKind.Indexed)
   @Hidden()
     attachedToClass?: Ref<Class<Doc>>
@@ -271,10 +275,16 @@ export class TDocIndexState extends TDoc implements DocIndexState {
   // Indexable attributes of document.
   attributes!: Record<string, any>
 
-  removed!: boolean
+  @Prop(TypeBoolean(), getEmbeddedLabel('Removed'))
+  @Index(IndexKind.Indexed)
+  @Hidden()
+    removed!: boolean
 
   // States for different stages
-  stages!: Record<string, boolean | string>
+  @Prop(TypeRecord(), getEmbeddedLabel('Stages'))
+  @Index(IndexKind.Indexed)
+  @Hidden()
+    stages!: Record<string, boolean | string>
 }
 
 @Model(core.class.IndexStageState, core.class.Doc, DOMAIN_DOC_INDEX_STATE)
diff --git a/models/core/src/index.ts b/models/core/src/index.ts
index f98436830c..74e91439d4 100644
--- a/models/core/src/index.ts
+++ b/models/core/src/index.ts
@@ -20,7 +20,8 @@ import {
   AttachedDoc,
   IndexingConfiguration,
   Class,
-  systemAccountEmail
+  systemAccountEmail,
+  DocIndexState
 } from '@hcengineering/core'
 import { Builder } from '@hcengineering/model'
 import core from './component'
@@ -157,4 +158,30 @@ export function createModel (builder: Builder): void {
       ]
     }
   )
+
+  builder.mixin<Class<DocIndexState>, IndexingConfiguration<TxCollectionCUD<Doc, AttachedDoc>>>(
+    core.class.DocIndexState,
+    core.class.Class,
+    core.mixin.IndexConfiguration,
+    {
+      indexes: [
+        {
+          _class: 1,
+          stages: 1,
+          _id: 1,
+          modifiedOn: 1
+        },
+        {
+          _class: 1,
+          _id: 1,
+          modifiedOn: 1
+        },
+        {
+          _class: 1,
+          _id: 1,
+          objectClass: 1
+        }
+      ]
+    }
+  )
 }
diff --git a/models/gmail/src/index.ts b/models/gmail/src/index.ts
index ea0a8e4c32..c7a1a90735 100644
--- a/models/gmail/src/index.ts
+++ b/models/gmail/src/index.ts
@@ -208,6 +208,10 @@ export function createModel (builder: Builder): void {
     },
     gmail.action.WriteEmail
   )
+
+  builder.mixin(gmail.class.Message, core.class.Class, core.mixin.FullTextSearchContext, {
+    parentPropagate: false
+  })
 }
 
 export { gmailOperation } from './migration'
diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts
index 20394405c4..47acf34634 100644
--- a/models/recruit/src/index.ts
+++ b/models/recruit/src/index.ts
@@ -1117,19 +1117,19 @@ export function createModel (builder: Builder): void {
   // Allow to use fuzzy search for mixins
   builder.mixin(recruit.class.Vacancy, core.class.Class, core.mixin.FullTextSearchContext, {
     fullTextSummary: true,
-    propogate: []
+    propagate: []
   })
 
   builder.mixin(recruit.mixin.Candidate, core.class.Class, core.mixin.FullTextSearchContext, {
     fullTextSummary: true,
-    propogate: [recruit.class.Applicant]
+    propagate: [recruit.class.Applicant]
   })
 
   // Allow to use fuzzy search for mixins
   builder.mixin(recruit.class.Applicant, core.class.Class, core.mixin.FullTextSearchContext, {
     fullTextSummary: true,
     forceIndex: true,
-    propogate: []
+    propagate: []
   })
 
   createAction(builder, {
diff --git a/models/telegram/src/index.ts b/models/telegram/src/index.ts
index f1a9c67cf0..3190e74b2b 100644
--- a/models/telegram/src/index.ts
+++ b/models/telegram/src/index.ts
@@ -170,6 +170,10 @@ export function createModel (builder: Builder): void {
     },
     telegram.ids.TxSharedCreate
   )
+
+  builder.mixin(telegram.class.Message, core.class.Class, core.mixin.FullTextSearchContext, {
+    parentPropagate: false
+  })
 }
 
 export { telegramOperation } from './migration'
diff --git a/packages/core/src/classes.ts b/packages/core/src/classes.ts
index c6160eb71f..b72652d6a1 100644
--- a/packages/core/src/classes.ts
+++ b/packages/core/src/classes.ts
@@ -405,7 +405,10 @@ export interface FullTextSearchContext extends Class<Doc> {
   forceIndex?: boolean
 
   // If defined, will propagate changes to child's with defined set of classes
-  propogate?: Ref<Class<Doc>>[]
+  propagate?: Ref<Class<Doc>>[]
+
+  // Do we need to propagate child value to parent one. Default(true)
+  parentPropagate?: boolean
 }
 
 /**
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index 024901c95b..7bce7a57f4 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -25,6 +25,7 @@ import { Tx, TxCUD, TxCollectionCUD, TxCreateDoc, TxProcessor, TxUpdateDoc } fro
 import { toFindResult } from './utils'
 
 const transactionThreshold = 500
+const modelTransactionThreshold = 50
 
 /**
  * @public
@@ -194,7 +195,11 @@ export async function createClient (
   const oldOnConnect: ((apply: boolean) => void) | undefined = conn.onConnect
   conn.onConnect = async () => {
     // Find all new transactions and apply
-    await loadModel(conn, loadedTxIds, allowedPlugins, configs, hierarchy, model)
+    if (!(await loadModel(conn, loadedTxIds, allowedPlugins, configs, hierarchy, model, true))) {
+      // We need full refresh
+      await oldOnConnect?.(false)
+      return
+    }
 
     // We need to look for last {transactionThreshold} transactions and if it is more since lastTx one we receive, we need to perform full refresh.
     const atxes = await conn.findAll(
@@ -216,7 +221,7 @@ export async function createClient (
       }
     }
 
-    if (atxes.total < transactionThreshold && !needFullRefresh) {
+    if (atxes.length < transactionThreshold && !needFullRefresh) {
       console.log('applying input transactions', atxes.length)
       for (const tx of atxes) {
         txHandler(tx)
@@ -236,8 +241,9 @@ async function loadModel (
   allowedPlugins: Plugin[] | undefined,
   configs: Map<Ref<PluginConfiguration>, PluginConfiguration>,
   hierarchy: Hierarchy,
-  model: ModelDb
-): Promise<void> {
+  model: ModelDb,
+  reload = false
+): Promise<boolean> {
   const t = Date.now()
 
   const atxes = await conn.findAll(
@@ -246,6 +252,10 @@ async function loadModel (
     { sort: { modifiedOn: SortingOrder.Ascending, _id: SortingOrder.Ascending } }
   )
 
+  if (reload && atxes.length > modelTransactionThreshold) {
+    return true
+  }
+
   let systemTx: Tx[] = []
   const userTx: Tx[] = []
   console.log('find' + (processedTx.size === 0 ? 'full model' : 'model diff'), atxes.length, Date.now() - t)
@@ -289,6 +299,7 @@ async function loadModel (
       console.error('failed to apply model transaction, skipping', JSON.stringify(tx), err)
     }
   }
+  return false
 }
 
 function fillConfiguration (systemTx: Tx[], configs: Map<Ref<PluginConfiguration>, PluginConfiguration>): void {
diff --git a/packages/core/src/component.ts b/packages/core/src/component.ts
index d9fd444239..645912278d 100644
--- a/packages/core/src/component.ts
+++ b/packages/core/src/component.ts
@@ -97,6 +97,7 @@ export default plugin(coreId, {
     TypeHyperlink: '' as Ref<Class<Type<Hyperlink>>>,
     TypeNumber: '' as Ref<Class<Type<number>>>,
     TypeMarkup: '' as Ref<Class<Type<string>>>,
+    TypeRecord: '' as Ref<Class<Type<Record<any, any>>>>,
     TypeBoolean: '' as Ref<Class<Type<boolean>>>,
     TypeTimestamp: '' as Ref<Class<Type<Timestamp>>>,
     TypeDate: '' as Ref<Class<Type<Timestamp | Date>>>,
@@ -151,6 +152,7 @@ export default plugin(coreId, {
     AttachedTo: '' as IntlString,
     AttachedToClass: '' as IntlString,
     String: '' as IntlString,
+    Record: '' as IntlString,
     Markup: '' as IntlString,
     Number: '' as IntlString,
     Boolean: '' as IntlString,
diff --git a/packages/core/src/measurements/metrics.ts b/packages/core/src/measurements/metrics.ts
index 4c6fd579e9..5f65f45b4a 100644
--- a/packages/core/src/measurements/metrics.ts
+++ b/packages/core/src/measurements/metrics.ts
@@ -68,7 +68,10 @@ export function childMetrics (root: Metrics, path: string[]): Metrics {
   return oop
 }
 
-function aggregate (m: Metrics): Metrics {
+/**
+ * @public
+ */
+export function metricsAggregate (m: Metrics): Metrics {
   const ms = aggregateMetrics(m.measurements)
 
   // Use child overage, if there is no top level value specified.
@@ -105,34 +108,38 @@ function aggregate (m: Metrics): Metrics {
 function aggregateMetrics (m: Record<string, Metrics>): Record<string, Metrics> {
   const result: Record<string, Metrics> = {}
   for (const [k, v] of Object.entries(m).sort((a, b) => b[1].time - a[1].time)) {
-    result[k] = aggregate(v)
+    result[k] = metricsAggregate(v)
   }
   return result
 }
 
-function toLen (val: string, sep: string, len = 50): string {
+function toLen (val: string, sep: string, len: number): string {
   while (val.length < len) {
     val += sep
   }
   return val
 }
 
-function printMetricsChildren (params: Record<string, Metrics>, offset: number): string {
+function printMetricsChildren (params: Record<string, Metrics>, offset: number, length: number): string {
   let r = ''
   if (Object.keys(params).length > 0) {
     r += '\n' + toLen('', ' ', offset)
     r += Object.entries(params)
-      .map(([k, vv]) => toString(k, vv, offset))
+      .map(([k, vv]) => toString(k, vv, offset, length))
       .join('\n' + toLen('', ' ', offset))
   }
   return r
 }
 
-function printMetricsParams (params: Record<string, Record<string, MetricsData>>, offset: number): string {
+function printMetricsParams (
+  params: Record<string, Record<string, MetricsData>>,
+  offset: number,
+  length: number
+): string {
   let r = ''
   const joinP = (key: string, data: Record<string, MetricsData>): string[] => {
     return Object.entries(data).map(([k, vv]) =>
-      `${toLen('', ' ', offset)}${toLen(key + '=' + k, '-', 70 - offset)}: avg ${
+      `${toLen('', ' ', offset)}${toLen(key + '=' + k, '-', length - offset)}: avg ${
         vv.time / (vv.operations > 0 ? vv.operations : 1)
       } total: ${vv.time} ops: ${vv.operations}`.trim()
     )
@@ -145,18 +152,62 @@ function printMetricsParams (params: Record<string, Record<string, MetricsData>>
   return r
 }
 
-function toString (name: string, m: Metrics, offset: number): string {
-  let r = `${toLen('', ' ', offset)}${toLen(name, '-', 70 - offset)}: avg ${
+function toString (name: string, m: Metrics, offset: number, length: number): string {
+  let r = `${toLen('', ' ', offset)}${toLen(name, '-', length - offset)}: avg ${
     m.time / (m.operations > 0 ? m.operations : 1)
   } total: ${m.time} ops: ${m.operations}`.trim()
-  r += printMetricsParams(m.params, offset + 4)
-  r += printMetricsChildren(m.measurements, offset + 4)
+  r += printMetricsParams(m.params, offset + 4, length)
+  r += printMetricsChildren(m.measurements, offset + 4, length)
   return r
 }
 
 /**
  * @public
  */
-export function metricsToString (metrics: Metrics, name = 'System'): string {
-  return toString(name, aggregate(metrics), 0)
+export function metricsToString (metrics: Metrics, name = 'System', length: number): string {
+  return toString(name, metricsAggregate(metrics), 0, length)
+}
+
+function printMetricsParamsRows (
+  params: Record<string, Record<string, MetricsData>>,
+  offset: number
+): (string | number)[][] {
+  const r: (string | number)[][] = []
+  function joinP (key: string, data: Record<string, MetricsData>): (string | number)[][] {
+    return Object.entries(data).map(([k, vv]) => [
+      offset,
+      `${key}=${k}`,
+      vv.time / (vv.operations > 0 ? vv.operations : 1),
+      vv.time,
+      vv.operations
+    ])
+  }
+  for (const [k, v] of Object.entries(params)) {
+    r.push(...joinP(k, v))
+  }
+  return r
+}
+
+function printMetricsChildrenRows (params: Record<string, Metrics>, offset: number): (string | number)[][] {
+  const r: (string | number)[][] = []
+  if (Object.keys(params).length > 0) {
+    Object.entries(params).forEach(([k, vv]) => r.push(...toStringRows(k, vv, offset)))
+  }
+  return r
+}
+
+function toStringRows (name: string, m: Metrics, offset: number): (number | string)[][] {
+  const r: (number | string)[][] = [
+    [offset, name, m.time / (m.operations > 0 ? m.operations : 1), m.time, m.operations]
+  ]
+  r.push(...printMetricsParamsRows(m.params, offset + 1))
+  r.push(...printMetricsChildrenRows(m.measurements, offset + 1))
+  return r
+}
+
+/**
+ * @public
+ */
+export function metricsToRows (metrics: Metrics, name = 'System'): (number | string)[][] {
+  return toStringRows(name, metricsAggregate(metrics), 0)
 }
diff --git a/packages/core/src/storage.ts b/packages/core/src/storage.ts
index e20351a6a1..3773d124c8 100644
--- a/packages/core/src/storage.ts
+++ b/packages/core/src/storage.ts
@@ -121,6 +121,9 @@ export type FindOptions<T extends Doc> = {
   sort?: SortingQuery<T>
   lookup?: Lookup<T>
   projection?: Projection<T>
+
+  // If specified total will be returned
+  total?: boolean
 }
 
 /**
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 2ef4a6ae28..6835925182 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -172,7 +172,11 @@ export function extractDocKey (key: string): {
  * @public
  */
 export function isFullTextAttribute (attr: AnyAttribute): boolean {
-  return attr.index === IndexKind.FullText || attr.type._class === core.class.TypeAttachment
+  return (
+    attr.index === IndexKind.FullText ||
+    attr.type._class === core.class.TypeAttachment ||
+    attr.type._class === core.class.EnumOf
+  )
 }
 
 /**
diff --git a/packages/model/src/dsl.ts b/packages/model/src/dsl.ts
index 164da47184..aed8be6a16 100644
--- a/packages/model/src/dsl.ts
+++ b/packages/model/src/dsl.ts
@@ -383,6 +383,13 @@ export function TypeMarkup (): Type<Markup> {
   return { _class: core.class.TypeMarkup, label: core.string.Markup }
 }
 
+/**
+ * @public
+ */
+export function TypeRecord (): Type<Markup> {
+  return { _class: core.class.TypeRecord, label: core.string.Record }
+}
+
 /**
  * @public
  */
diff --git a/packages/platform-rig/profiles/default/tsconfig.json b/packages/platform-rig/profiles/default/tsconfig.json
index 0074c36d4f..7eba506e7b 100644
--- a/packages/platform-rig/profiles/default/tsconfig.json
+++ b/packages/platform-rig/profiles/default/tsconfig.json
@@ -8,6 +8,7 @@
     "resolveJsonModule": true,
     "types": ["heft-jest"],
     "skipLibCheck": true,
-    "incremental": true
+    "incremental": true,
+    "declarationMap": true
   }
 }
\ No newline at end of file
diff --git a/packages/platform-rig/profiles/ui/tsconfig.json b/packages/platform-rig/profiles/ui/tsconfig.json
index 199554d16c..7e059d1483 100644
--- a/packages/platform-rig/profiles/ui/tsconfig.json
+++ b/packages/platform-rig/profiles/ui/tsconfig.json
@@ -9,6 +9,7 @@
     "skipLibCheck": true,
     "incremental": true,
     "esModuleInterop": true,
+    "declarationMap": true,
     "lib": [
       "esnext",
       "dom"
diff --git a/packages/platform/src/event.ts b/packages/platform/src/event.ts
index 015e899034..1a3b69d58c 100644
--- a/packages/platform/src/event.ts
+++ b/packages/platform/src/event.ts
@@ -54,7 +54,10 @@ export function removeEventListener (event: string, listener: EventListener): vo
   }
 }
 
-async function broadcastEvent (event: string, data: any): Promise<void> {
+/**
+ * @public
+ */
+export async function broadcastEvent (event: string, data: any): Promise<void> {
   const listeners = eventListeners.get(event)
   if (listeners !== undefined) {
     const promises = listeners.map(async (listener) => await listener(event, data))
diff --git a/packages/presentation/src/components/Card.svelte b/packages/presentation/src/components/Card.svelte
index a99b46291d..c965985910 100644
--- a/packages/presentation/src/components/Card.svelte
+++ b/packages/presentation/src/components/Card.svelte
@@ -73,7 +73,7 @@
       />
     </div>
   </div>
-  <Scroller>
+  <Scroller horizontal>
     <div class="antiCard-content">
       <slot />
     </div>
diff --git a/packages/presentation/src/components/IndexedDocumentContent.svelte b/packages/presentation/src/components/IndexedDocumentContent.svelte
index f8229837fa..904ead2d79 100644
--- a/packages/presentation/src/components/IndexedDocumentContent.svelte
+++ b/packages/presentation/src/components/IndexedDocumentContent.svelte
@@ -11,6 +11,9 @@
   const client = getClient()
 
   function getContent (extra: string[], value: string): string[] {
+    if (value == null || value === '') {
+      return []
+    }
     const result = extra.includes('base64') ? decodeURIComponent(escape(atob(value))) : value
 
     return `${result}`.split('\n')
@@ -43,8 +46,12 @@
 {#if summary}
   {#if search.length > 0}
     Result:
-    {#each summary.split('\n').filter((line) => line.toLowerCase().includes(search.toLowerCase())) as line}
-      <span class:highlight={true}>{line}</span>
+    {#each summary.split('\n').filter((line, idx, arr) => {
+      return line.toLowerCase().includes(search.toLowerCase()) || arr[idx - 1]
+          ?.toLowerCase()
+          .includes(search.toLowerCase())
+    }) as line}
+      <span class:highlight={line.toLowerCase().includes(search.toLowerCase())}>{line}</span>
     {/each}
     <br />
   {/if}
diff --git a/packages/presentation/src/components/IndexedDocumentPreview.svelte b/packages/presentation/src/components/IndexedDocumentPreview.svelte
index 1349b56200..aed7e0c5ab 100644
--- a/packages/presentation/src/components/IndexedDocumentPreview.svelte
+++ b/packages/presentation/src/components/IndexedDocumentPreview.svelte
@@ -53,7 +53,7 @@
     display: grid;
     overflow: auto;
     min-width: 50rem;
-    max-width: 200rem;
+    max-width: 80rem;
   }
   .indexed-background {
     background-color: white;
diff --git a/packages/presentation/src/components/PDFViewer.svelte b/packages/presentation/src/components/PDFViewer.svelte
index 039b97ca45..89b10648fd 100644
--- a/packages/presentation/src/components/PDFViewer.svelte
+++ b/packages/presentation/src/components/PDFViewer.svelte
@@ -19,7 +19,6 @@
   import presentation from '..'
   import { getFileUrl } from '../utils'
   import Download from './icons/Download.svelte'
-  import IndexedDocumentPreview from './IndexedDocumentPreview.svelte'
 
   export let file: string
   export let name: string
@@ -79,8 +78,6 @@
       <img class="img-fit" src={getFileUrl(file)} alt="" />
     </div>
     <div class="space" />
-  {:else if contentType && contentType.startsWith('application/msword')}
-    <IndexedDocumentPreview objectId={value._id} noPanel />
   {:else}
     <iframe
       class="pdfviewer-content"
diff --git a/packages/query/src/index.ts b/packages/query/src/index.ts
index 98ce3b784b..cdee0197c3 100644
--- a/packages/query/src/index.ts
+++ b/packages/query/src/index.ts
@@ -342,7 +342,9 @@ export class LiveQuery extends TxProcessor implements Client {
         const pos = q.result.findIndex((p) => p._id === _id)
         if (pos !== -1) {
           q.result.splice(pos, 1)
-          q.total--
+          if (q.options?.total === true) {
+            q.total--
+          }
         }
       }
     } else {
@@ -369,7 +371,9 @@ export class LiveQuery extends TxProcessor implements Client {
         return true
       } else {
         q.result.splice(pos, 1)
-        q.total--
+        if (q.options?.total === true) {
+          q.total--
+        }
       }
     }
     return false
@@ -397,7 +401,9 @@ export class LiveQuery extends TxProcessor implements Client {
         return true
       } else {
         q.result.splice(pos, 1)
-        q.total--
+        if (q.options?.total === true) {
+          q.total--
+        }
       }
     } else {
       q.result[pos] = updatedDoc
@@ -664,7 +670,9 @@ export class LiveQuery extends TxProcessor implements Client {
           q.result[pos] = doc
         } else {
           q.result.push(doc)
-          q.total++
+          if (q.options?.total === true) {
+            q.total++
+          }
         }
         return true
       }
@@ -770,7 +778,9 @@ export class LiveQuery extends TxProcessor implements Client {
         }
 
         q.result.push(doc)
-        q.total++
+        if (q.options?.total === true) {
+          q.total++
+        }
 
         if (q.options?.sort !== undefined) {
           await resultSort(q.result, q.options?.sort, q._class, this.getHierarchy(), this.client.getModel())
@@ -874,7 +884,9 @@ export class LiveQuery extends TxProcessor implements Client {
     const index = q.result.findIndex((p) => p._id === tx.objectId)
     if (index > -1) {
       q.result.splice(index, 1)
-      q.total--
+      if (q.options?.total === true) {
+        q.total--
+      }
       await this.callback(q)
     }
     await this.handleDocRemoveLookup(q, tx)
diff --git a/packages/ui/src/components/internal/Root.svelte b/packages/ui/src/components/internal/Root.svelte
index cfa1df6657..1c288fdaf9 100644
--- a/packages/ui/src/components/internal/Root.svelte
+++ b/packages/ui/src/components/internal/Root.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
+  import { addEventListener, getMetadata, OK, PlatformEvent } from '@hcengineering/platform'
   import { onDestroy } from 'svelte'
-  import { getMetadata, OK } from '@hcengineering/platform'
-  import { PlatformEvent, addEventListener } from '@hcengineering/platform'
   import type { AnyComponent } from '../../types'
   // import { applicationShortcutKey } from '../../utils'
   import { getCurrentLocation, location, navigate } from '../../location'
@@ -12,14 +11,14 @@
   import StatusComponent from '../Status.svelte'
   import Clock from './Clock.svelte'
   // import Mute from './icons/Mute.svelte'
-  import WiFi from './icons/WiFi.svelte'
+  import { checkMobile, deviceOptionsStore as deviceInfo, networkStatus } from '../../'
+  import uiPlugin from '../../plugin'
+  import FontSizeSelector from './FontSizeSelector.svelte'
   import Computer from './icons/Computer.svelte'
   import Phone from './icons/Phone.svelte'
-  import ThemeSelector from './ThemeSelector.svelte'
-  import FontSizeSelector from './FontSizeSelector.svelte'
+  import WiFi from './icons/WiFi.svelte'
   import LangSelector from './LangSelector.svelte'
-  import uiPlugin from '../../plugin'
-  import { checkMobile, deviceOptionsStore as deviceInfo } from '../../'
+  import ThemeSelector from './ThemeSelector.svelte'
 
   let application: AnyComponent | undefined
 
@@ -130,8 +129,17 @@
               size={'small'}
             />
           </div>
-          <div class="flex-center widget cursor-pointer mr-3">
-            <WiFi size={'small'} />
+          <!-- svelte-ignore a11y-click-events-have-key-events -->
+          <div
+            class="flex-center widget cursor-pointer mr-3"
+            on:click={(evt) => {
+              getMetadata(uiPlugin.metadata.ShowNetwork)?.(evt)
+            }}
+          >
+            <WiFi
+              size={'small'}
+              fill={$networkStatus === -1 ? 'red' : $networkStatus % 2 === 1 ? 'blue' : 'currentColor'}
+            />
           </div>
         </div>
       </div>
diff --git a/packages/ui/src/components/internal/icons/WiFi.svelte b/packages/ui/src/components/internal/icons/WiFi.svelte
index 2908def178..e870683160 100644
--- a/packages/ui/src/components/internal/icons/WiFi.svelte
+++ b/packages/ui/src/components/internal/icons/WiFi.svelte
@@ -1,17 +1,20 @@
 <script lang="ts">
   export let size: 'small' | 'medium' | 'large'
-  const fill: string = 'currentColor'
+  export let fill: string = 'currentColor'
 </script>
 
 <svg class="svg-{size}" {fill} viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <g>
+  <g stroke={fill}>
     <path
+      stroke-width={fill !== 'currentColor' ? 2 : 1}
       d="M12,10.9c-2.7,0-5.1,1.1-6.8,3.1C5,14.3,5,14.7,5.4,14.9s0.7,0.2,0.9-0.1c1.4-1.6,3.5-2.5,5.8-2.5s4.4,0.9,5.8,2.6 c0.1,0.1,0.3,0.2,0.6,0.2c0.1,0,0.3,0,0.5-0.1c0.3-0.2,0.3-0.7,0.1-0.9C17.2,11.9,14.7,10.9,12,10.9z"
     />
     <path
+      stroke-width={fill !== 'currentColor' ? 2 : 1}
       d="M12,17.9c-1.1,0-2.3,0.5-2.9,1.1c-0.2,0.2-0.2,0.7,0,0.9c0.2,0.2,0.7,0.2,0.9,0c0.9-1,3.1-1,4.1,0c0.1,0.1,0.3,0.2,0.5,0.2 c0.2,0,0.3-0.1,0.5-0.2c0.2-0.2,0.2-0.7,0-0.9C14.3,18.4,13.1,17.9,12,17.9z"
     />
     <path
+      stroke-width={fill !== 'currentColor' ? 2 : 1}
       d="M23.9,9.7C20.8,6,16.5,3.8,12,3.8S3.2,6,0.2,9.7c-0.2,0.3-0.2,0.7,0.1,0.9c0.3,0.2,0.7,0.2,0.9-0.1 c2.7-3.4,6.7-5.3,10.7-5.3s8,1.9,10.7,5.4c0.1,0.1,0.3,0.2,0.6,0.2c0.1,0,0.3,0,0.5-0.1C24,10.5,24.1,10,23.9,9.7z"
     />
   </g>
diff --git a/packages/ui/src/plugin.ts b/packages/ui/src/plugin.ts
index 7e8c5adf9b..301c1f845e 100644
--- a/packages/ui/src/plugin.ts
+++ b/packages/ui/src/plugin.ts
@@ -74,7 +74,10 @@ export const uis = plugin(uiId, {
   },
   metadata: {
     DefaultApplication: '' as Metadata<AnyComponent>,
-    Routes: '' as Metadata<Map<string, AnyComponent>>
+    Routes: '' as Metadata<Map<string, AnyComponent>>,
+
+    // Will activate network click button
+    ShowNetwork: '' as Metadata<(evt: MouseEvent) => void>
   }
 })
 
diff --git a/packages/ui/src/utils.ts b/packages/ui/src/utils.ts
index fd07ec922d..04dbb1d827 100644
--- a/packages/ui/src/utils.ts
+++ b/packages/ui/src/utils.ts
@@ -16,6 +16,7 @@
 import { generateId } from '@hcengineering/core'
 import type { Metadata } from '@hcengineering/platform'
 import { setMetadata } from '@hcengineering/platform'
+import { writable } from 'svelte/store'
 import { Notification, NotificationPosition, NotificationSeverity, notificationsStore } from '.'
 import { AnyComponent, AnySvelteComponent } from './types'
 
@@ -99,3 +100,8 @@ export function tableToCSV (tableId: string, separator = ','): string {
   }
   return csv.join('\n')
 }
+
+/**
+ * @public
+ */
+export const networkStatus = writable<number>(0)
diff --git a/plugins/board-resources/src/components/presenters/ChecklistsPresenter.svelte b/plugins/board-resources/src/components/presenters/ChecklistsPresenter.svelte
index d4b89944ac..41d877430c 100644
--- a/plugins/board-resources/src/components/presenters/ChecklistsPresenter.svelte
+++ b/plugins/board-resources/src/components/presenters/ChecklistsPresenter.svelte
@@ -16,14 +16,19 @@
   })
   const query = createQuery()
   let done: number, total: number, item: TodoItem
-  $: query.query(task.class.TodoItem, { space: value.space, attachedTo: { $in: todoLists } }, (result) => {
-    total = result.total
-    done = result.filter((t) => t.done).length
-    if (!total) return
-    item = result.reduce((min, cur) =>
-      cur.dueTo === null ? min : min.dueTo === null || cur.dueTo < min.dueTo ? cur : min
-    )
-  })
+  $: query.query(
+    task.class.TodoItem,
+    { space: value.space, attachedTo: { $in: todoLists } },
+    (result) => {
+      total = result.total
+      done = result.filter((t) => t.done).length
+      if (!total) return
+      item = result.reduce((min, cur) =>
+        cur.dueTo === null ? min : min.dueTo === null || cur.dueTo < min.dueTo ? cur : min
+      )
+    },
+    { total: true }
+  )
 </script>
 
 {#if value && (total ?? 0) > 0}
diff --git a/plugins/board-resources/src/utils/BoardUtils.ts b/plugins/board-resources/src/utils/BoardUtils.ts
index 571c517a7e..ab172e125b 100644
--- a/plugins/board-resources/src/utils/BoardUtils.ts
+++ b/plugins/board-resources/src/utils/BoardUtils.ts
@@ -61,7 +61,7 @@ export function getDateIcon (item: TodoItem): 'normal' | 'warning' | 'overdue' {
 
 export const commonBoardPreference = readable<CommonBoardPreference>(undefined, (set) => {
   createQuery().query(board.class.CommonBoardPreference, { attachedTo: board.app.Board }, (result) => {
-    if (result.total > 0) return set(result[0])
+    if (result.length > 0) return set(result[0])
     void getClient().createDoc(board.class.CommonBoardPreference, preference.space.Preference, {
       attachedTo: board.app.Board
     })
diff --git a/plugins/chunter-resources/src/components/EditChannelDescriptionAttachments.svelte b/plugins/chunter-resources/src/components/EditChannelDescriptionAttachments.svelte
index 067754003c..5563089502 100644
--- a/plugins/chunter-resources/src/components/EditChannelDescriptionAttachments.svelte
+++ b/plugins/chunter-resources/src/components/EditChannelDescriptionAttachments.svelte
@@ -67,7 +67,8 @@
       },
       {
         limit: ATTACHEMNTS_LIMIT,
-        sort
+        sort,
+        total: true
       }
     )
 </script>
diff --git a/plugins/chunter-resources/src/components/Thread.svelte b/plugins/chunter-resources/src/components/Thread.svelte
index 9162e4d16e..5937df1741 100644
--- a/plugins/chunter-resources/src/components/Thread.svelte
+++ b/plugins/chunter-resources/src/components/Thread.svelte
@@ -79,7 +79,8 @@
       lookup,
       sort: {
         createOn: SortingOrder.Descending
-      }
+      },
+      total: true
     }
     if (!showAll) {
       options.limit = 4
diff --git a/plugins/client-resources/src/connection.ts b/plugins/client-resources/src/connection.ts
index d770173c80..21675a75cc 100644
--- a/plugins/client-resources/src/connection.ts
+++ b/plugins/client-resources/src/connection.ts
@@ -37,6 +37,7 @@ import {
   PlatformError,
   ReqId,
   UNAUTHORIZED,
+  broadcastEvent,
   getMetadata,
   readResponse,
   serialize,
@@ -152,6 +153,8 @@ class Connection implements ClientConnection {
 
   sockets = 0
 
+  incomingTimer: any
+
   private openConnection (): Promise<ClientSocket> {
     return new Promise((resolve, reject) => {
       // Use defined factory or browser default one.
@@ -196,6 +199,7 @@ class Connection implements ClientConnection {
           } else {
             promise.resolve(resp.result)
           }
+          void broadcastEvent(client.event.NetworkRequests, this.requests.size)
         } else {
           const tx = resp.result as Tx
           if (
@@ -214,6 +218,13 @@ class Connection implements ClientConnection {
             return
           }
           this.handler(tx)
+
+          clearTimeout(this.incomingTimer)
+          void broadcastEvent(client.event.NetworkRequests, this.requests.size + 1)
+
+          this.incomingTimer = setTimeout(() => {
+            void broadcastEvent(client.event.NetworkRequests, this.requests.size)
+          }, 500)
         }
       }
       websocket.onclose = (ev) => {
@@ -222,6 +233,7 @@ class Connection implements ClientConnection {
         if (!(this.websocket instanceof Promise)) {
           this.websocket = null
         }
+        void broadcastEvent(client.event.NetworkRequests, -1)
         reject(new Error('websocket error'))
       }
       websocket.onopen = () => {
@@ -237,6 +249,7 @@ class Connection implements ClientConnection {
       }
       websocket.onerror = (event: any) => {
         console.error('client websocket error:', socketId, event)
+        void broadcastEvent(client.event.NetworkRequests, -1)
         reject(new Error(`websocket error:${socketId}`))
       }
     })
@@ -251,6 +264,7 @@ class Connection implements ClientConnection {
     if (this.closed) {
       throw new PlatformError(unknownError('connection closed'))
     }
+
     const id = this.lastId++
     const promise = new RequestPromise(data.method, data.params)
 
@@ -280,6 +294,7 @@ class Connection implements ClientConnection {
       }, 500)
     }
     await sendData()
+    void broadcastEvent(client.event.NetworkRequests, this.requests.size)
     return await promise.promise
   }
 
diff --git a/plugins/client/src/index.ts b/plugins/client/src/index.ts
index fc3393c8e8..1c06f57f92 100644
--- a/plugins/client/src/index.ts
+++ b/plugins/client/src/index.ts
@@ -80,5 +80,8 @@ export default plugin(clientId, {
   },
   function: {
     GetClient: '' as Resource<ClientFactory>
+  },
+  event: {
+    NetworkRequests: '' as Metadata<string>
   }
 })
diff --git a/plugins/setting-resources/src/components/typeEditors/EnumTypeEditor.svelte b/plugins/setting-resources/src/components/typeEditors/EnumTypeEditor.svelte
index fbc6866125..5cd0cc4d4c 100644
--- a/plugins/setting-resources/src/components/typeEditors/EnumTypeEditor.svelte
+++ b/plugins/setting-resources/src/components/typeEditors/EnumTypeEditor.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import core, { Enum, EnumOf, Ref } from '@hcengineering/core'
+  import core, { Enum, EnumOf, IndexKind, Ref } from '@hcengineering/core'
   import { TypeEnum } from '@hcengineering/model'
   import presentation, { getClient } from '@hcengineering/presentation'
   import { Button, Label, showPopup } from '@hcengineering/ui'
@@ -40,7 +40,7 @@
 
   function changeEnum (value: Enum) {
     type = TypeEnum(value._id)
-    dispatch('change', { type, defaultValue })
+    dispatch('change', { type, defaultValue, index: IndexKind.FullText })
   }
 
   async function updateSelected (ref: Ref<Enum> | undefined) {
diff --git a/plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte b/plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte
index befddc8f35..b87527ba31 100644
--- a/plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte
+++ b/plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte
@@ -68,9 +68,6 @@
   $: selected = !Array.isArray(value) ? ('attachedTo' in value ? value.attachedTo : undefined) : undefined
   $: ignoreObjects = !Array.isArray(value) ? ('_id' in value ? [value._id] : []) : undefined
   $: docQuery = {
-    '$lookup.status.category': {
-      $nin: [tracker.issueStatusCategory.Completed, tracker.issueStatusCategory.Canceled]
-    },
     'parents.parentId': {
       $nin: [
         ...new Set(
diff --git a/plugins/view-resources/src/components/Table.svelte b/plugins/view-resources/src/components/Table.svelte
index a05918e1f4..3f0652dc88 100644
--- a/plugins/view-resources/src/components/Table.svelte
+++ b/plugins/view-resources/src/components/Table.svelte
@@ -117,7 +117,7 @@
         dispatch('content', objects)
         loading = loading === 1 ? 0 : -1
       },
-      { sort, limit, ...options, lookup }
+      { sort, limit, ...options, lookup, total: true }
     )
     if (update && ++loading > 0) {
       objects = []
diff --git a/plugins/workbench-resources/src/components/ServerStatistics.svelte b/plugins/workbench-resources/src/components/ServerStatistics.svelte
new file mode 100644
index 0000000000..4473d5b162
--- /dev/null
+++ b/plugins/workbench-resources/src/components/ServerStatistics.svelte
@@ -0,0 +1,53 @@
+<script lang="ts">
+  import { metricsToRows } from '@hcengineering/core'
+  import { getEmbeddedLabel } from '@hcengineering/platform'
+  import { Card } from '@hcengineering/presentation'
+  import { ticker } from '@hcengineering/ui'
+  import { onDestroy } from 'svelte'
+
+  export let endpoint: string
+
+  let data: any
+
+  onDestroy(
+    ticker.subscribe(() => {
+      fetch(endpoint, {
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }).then(async (json) => {
+        data = await json.json()
+      })
+    })
+  )
+</script>
+
+<Card on:close fullSize label={getEmbeddedLabel('Statistics')} okAction={() => {}} okLabel={getEmbeddedLabel('Ok')}>
+  {#if data}
+    {JSON.stringify(data.activeSessions, null, 2)}
+    <table class="antiTable" class:highlightRows={true}>
+      <thead class="scroller-thead">
+        <tr>
+          <th>Name</th>
+          <th>Average</th>
+          <th>Total</th>
+          <th>Ops</th>
+        </tr>
+      </thead>
+      <tbody>
+        {#each metricsToRows(data.metrics, 'System') as row}
+          <tr class="antiTable-body__row">
+            <td>
+              <span style={`padding-left: ${row[0]}rem;`}>
+                {row[1]}
+              </span>
+            </td>
+            <td>{row[2]}</td>
+            <td>{row[3]}</td>
+            <td>{row[4]}</td>
+          </tr>
+        {/each}
+      </tbody>
+    </table>
+  {/if}
+</Card>
diff --git a/plugins/workbench-resources/src/components/WorkbenchApp.svelte b/plugins/workbench-resources/src/components/WorkbenchApp.svelte
index a3cc8727e9..77b486b506 100644
--- a/plugins/workbench-resources/src/components/WorkbenchApp.svelte
+++ b/plugins/workbench-resources/src/components/WorkbenchApp.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { getMetadata } from '@hcengineering/platform'
-  import { Component, Loading, location, Notifications } from '@hcengineering/ui'
+  import { Component, Loading, Notifications, location } from '@hcengineering/ui'
   import { connect, versionError } from '../connect'
 
   import { workbenchId } from '@hcengineering/workbench'
diff --git a/plugins/workbench-resources/src/connect.ts b/plugins/workbench-resources/src/connect.ts
index 521c84c4b1..d7bc30401a 100644
--- a/plugins/workbench-resources/src/connect.ts
+++ b/plugins/workbench-resources/src/connect.ts
@@ -1,16 +1,28 @@
 import client from '@hcengineering/client'
 import contact from '@hcengineering/contact'
-import core, { Client, setCurrentAccount, Version, versionToString } from '@hcengineering/core'
+import core, { AccountRole, Client, setCurrentAccount, Version, versionToString } from '@hcengineering/core'
 import login, { loginId } from '@hcengineering/login'
-import { getMetadata, getResource, setMetadata } from '@hcengineering/platform'
+import { addEventListener, getMetadata, getResource, setMetadata } from '@hcengineering/platform'
 import presentation, { refreshClient, setClient } from '@hcengineering/presentation'
-import { fetchMetadataLocalStorage, getCurrentLocation, navigate, setMetadataLocalStorage } from '@hcengineering/ui'
+import ui, {
+  fetchMetadataLocalStorage,
+  getCurrentLocation,
+  navigate,
+  networkStatus,
+  setMetadataLocalStorage,
+  showPopup
+} from '@hcengineering/ui'
+import ServerStatistics from './components/ServerStatistics.svelte'
 
 export let versionError: string | undefined = ''
 
 let _token: string | undefined
 let _client: Client | undefined
 
+addEventListener(client.event.NetworkRequests, async (event: string, val: number) => {
+  networkStatus.set(val)
+})
+
 export async function connect (title: string): Promise<Client | undefined> {
   const loc = getCurrentLocation()
   const ws = loc.path[1]
@@ -105,13 +117,13 @@ export async function connect (title: string): Promise<Client | undefined> {
     version = await _client.findOne<Version>(core.class.Version, {})
     console.log('Model version', version)
 
-    const requirdVersion = getMetadata(presentation.metadata.RequiredVersion)
-    if (requirdVersion !== undefined && version !== undefined) {
-      console.log('checking min model version', requirdVersion)
+    const requiredVersion = getMetadata(presentation.metadata.RequiredVersion)
+    if (requiredVersion !== undefined && version !== undefined) {
+      console.log('checking min model version', requiredVersion)
       const versionStr = versionToString(version)
 
-      if (version === undefined || requirdVersion !== versionStr) {
-        versionError = `${versionStr} => ${requirdVersion}`
+      if (version === undefined || requiredVersion !== versionStr) {
+        versionError = `${versionStr} => ${requiredVersion}`
         return undefined
       }
     }
@@ -129,6 +141,18 @@ export async function connect (title: string): Promise<Client | undefined> {
   document.title = [ws, title].filter((it) => it).join(' - ')
   await setClient(_client)
 
+  if (me.role === AccountRole.Owner) {
+    setMetadata(ui.metadata.ShowNetwork, (evt: MouseEvent) => {
+      showPopup(
+        ServerStatistics,
+        {
+          endpoint: endpoint.replace(/^ws/g, 'http') + '/' + token
+        },
+        'top'
+      )
+    })
+  }
+
   return _client
 }
 
diff --git a/pods/collaborator/src/metrics.ts b/pods/collaborator/src/metrics.ts
index 883a8c1576..128c637e37 100644
--- a/pods/collaborator/src/metrics.ts
+++ b/pods/collaborator/src/metrics.ts
@@ -4,7 +4,7 @@ import { writeFile } from 'fs/promises'
 const metricsFile = process.env.METRICS_FILE
 const metricsConsole = (process.env.METRICS_CONSOLE ?? 'false') === 'true'
 
-const METRICS_UPDATE_INTERVAL = 30000
+const METRICS_UPDATE_INTERVAL = !metricsConsole ? 1000 : 30000
 
 const metrics = newMetrics()
 export const metricsContext = new MeasureMetricsContext('System', {}, metrics)
@@ -14,7 +14,7 @@ if (metricsFile !== undefined || metricsConsole) {
   let oldMetricsValue = ''
 
   const intTimer = setInterval(() => {
-    const val = metricsToString(metrics)
+    const val = metricsToString(metrics, 'System', 140)
     if (val !== oldMetricsValue) {
       oldMetricsValue = val
       if (metricsFile !== undefined) {
diff --git a/pods/server/src/server.ts b/pods/server/src/server.ts
index 91b0ad0f6f..badff33b5b 100644
--- a/pods/server/src/server.ts
+++ b/pods/server/src/server.ts
@@ -217,7 +217,7 @@ export function start (
     const stages: FullTextPipelineStage[] = []
 
     // Add regular stage to for indexable fields change tracking.
-    stages.push(new IndexedFieldStage(storage, fullText.newChild('fields', {})))
+    stages.push(new IndexedFieldStage(storage))
 
     // Obtain text content from storage(like minio) and use content adapter to convert files to text content.
     stages.push(new ContentRetrievalStage(storageAdapter, workspace, fullText.newChild('content', {}), contentAdapter))
@@ -232,16 +232,16 @@ export function start (
     // stages.push(retranslateStage)
 
     // Summary stage
-    const summaryStage = new FullSummaryStage()
+    const summaryStage = new FullSummaryStage(storage)
 
     stages.push(summaryStage)
 
     // Push all content to elastic search
-    const pushStage = new FullTextPushStage(adapter, workspace, fullText.newChild('push', {}))
+    const pushStage = new FullTextPushStage(storage, adapter, workspace)
     stages.push(pushStage)
 
     // OpenAI prepare stage
-    const openAIStage = new OpenAIEmbeddingsStage(adapter, fullText.newChild('embeddings', {}), workspace)
+    const openAIStage = new OpenAIEmbeddingsStage(adapter, workspace)
     // We depend on all available stages.
     openAIStage.require = stages.map((it) => it.stageId)
 
diff --git a/server-plugins/chunter-resources/src/index.ts b/server-plugins/chunter-resources/src/index.ts
index 2da4afeb2f..6be2ce97d8 100644
--- a/server-plugins/chunter-resources/src/index.ts
+++ b/server-plugins/chunter-resources/src/index.ts
@@ -301,7 +301,7 @@ export async function DMTrigger (tx: Tx, control: TriggerControl): Promise<Tx[]>
   }
   const doc = TxProcessor.createDoc2Doc(actualTx as TxCreateDoc<ChunterMessage>)
   const dms = await control.findAll(chunter.class.DirectMessage, { _id: doc.space })
-  if (dms.total === 0) {
+  if (dms.length === 0) {
     return []
   }
   const sender = await getEmployeeAccountById(ctx.tx.modifiedBy, control)
diff --git a/server-plugins/openai/src/openai.ts b/server-plugins/openai/src/openai.ts
index 16fb53e100..f45b1f01d4 100644
--- a/server-plugins/openai/src/openai.ts
+++ b/server-plugins/openai/src/openai.ts
@@ -102,7 +102,7 @@ export class OpenAIEmbeddingsStage implements FullTextPipelineStage {
 
   async update (doc: DocIndexState, update: DocumentUpdate<DocIndexState>): Promise<void> {}
 
-  constructor (readonly adapter: FullTextAdapter, readonly metrics: MeasureContext, readonly workspaceId: WorkspaceId) {}
+  constructor (readonly adapter: FullTextAdapter, readonly workspaceId: WorkspaceId) {}
 
   updateSummary (summary: FullSummaryStage): void {
     summary.fieldFilter.push((attr, value) => {
@@ -249,7 +249,6 @@ export class OpenAIEmbeddingsStage implements FullTextPipelineStage {
     const queryString = query.$search.replace('\n ', ' ')
     const embeddingData = await this.getEmbedding(queryString)
     const embedding = embeddingData.data[0].embedding
-    console.log('search embedding', embedding)
     const docs = await this.adapter.searchEmbedding(_classes, query, embedding, {
       size,
       from,
@@ -265,7 +264,7 @@ export class OpenAIEmbeddingsStage implements FullTextPipelineStage {
     }
   }
 
-  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline): Promise<void> {
+  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline, metrics: MeasureContext): Promise<void> {
     if (!this.enabled) {
       return
     }
@@ -273,12 +272,12 @@ export class OpenAIEmbeddingsStage implements FullTextPipelineStage {
       if (pipeline.cancelling) {
         return
       }
-      await this.limitter.add(() => this.collectDoc(doc, pipeline))
+      await this.limitter.add(() => this.collectDoc(doc, pipeline, metrics))
     }
     await this.limitter.waitProcessing()
   }
 
-  async collectDoc (doc: DocIndexState, pipeline: FullTextPipeline): Promise<void> {
+  async collectDoc (doc: DocIndexState, pipeline: FullTextPipeline, metrics: MeasureContext): Promise<void> {
     if (pipeline.cancelling) {
       return
     }
@@ -311,11 +310,7 @@ export class OpenAIEmbeddingsStage implements FullTextPipelineStage {
         let embeddingData: OpenAIEmbeddingResponse | undefined
         while (true) {
           try {
-            embeddingData = await this.metrics.with(
-              'fetch-embeddings',
-              {},
-              async () => await this.getEmbedding(embeddText)
-            )
+            embeddingData = await metrics.with('fetch-embeddings', {}, async () => await this.getEmbedding(embeddText))
             break
           } catch (err: any) {
             if (((err.message as string) ?? '').includes('connect ECONNREFUSED')) {
diff --git a/server/account/tsconfig.json b/server/account/tsconfig.json
index 9b47eded03..c0a79c9fbe 100644
--- a/server/account/tsconfig.json
+++ b/server/account/tsconfig.json
@@ -5,4 +5,4 @@
     "rootDir": "./src",
     "outDir": "./lib"
   }
-}
\ No newline at end of file
+}
diff --git a/server/core/src/adapter.ts b/server/core/src/adapter.ts
index 0a987cdd88..24d28e692f 100644
--- a/server/core/src/adapter.ts
+++ b/server/core/src/adapter.ts
@@ -22,6 +22,7 @@ import {
   FindOptions,
   FindResult,
   Hierarchy,
+  IndexingConfiguration,
   ModelDb,
   Ref,
   StorageIterator,
@@ -40,6 +41,9 @@ export interface DbAdapter {
    * Method called after hierarchy is ready to use.
    */
   init: (model: Tx[]) => Promise<void>
+
+  createIndexes: (domain: Domain, config: Pick<IndexingConfiguration<Doc>, 'indexes'>) => Promise<void>
+
   close: () => Promise<void>
   findAll: <T extends Doc>(
     _class: Ref<Class<T>>,
@@ -97,6 +101,8 @@ export class DummyDbAdapter implements DbAdapter {
     return toFindResult([])
   }
 
+  async createIndexes (domain: Domain, config: Pick<IndexingConfiguration<Doc>, 'indexes'>): Promise<void> {}
+
   async tx (...tx: Tx[]): Promise<TxResult> {
     return {}
   }
diff --git a/server/core/src/fulltext.ts b/server/core/src/fulltext.ts
index 10f6ab40d9..d991a620b1 100644
--- a/server/core/src/fulltext.ts
+++ b/server/core/src/fulltext.ts
@@ -46,7 +46,6 @@ import type { FullTextAdapter, IndexedDoc, WithFind } from './types'
  */
 export class FullTextIndex implements WithFind {
   txFactory = new TxFactory(core.account.System, true)
-
   consistency: Promise<void> | undefined
 
   constructor (
@@ -59,6 +58,7 @@ export class FullTextIndex implements WithFind {
     private readonly upgrade: boolean
   ) {
     if (!upgrade) {
+      // Schedule indexing after consistency check
       this.consistency = this.indexer.checkIndexConsistency(dbStorage)
 
       // Schedule indexing after consistency check
@@ -120,7 +120,6 @@ export class FullTextIndex implements WithFind {
     query: DocumentQuery<T>,
     options?: FindOptions<T>
   ): Promise<FindResult<T>> {
-    console.log('search', query)
     const { _id, $search, ...mainQuery } = query
     if ($search === undefined) return toFindResult([])
 
@@ -143,7 +142,7 @@ export class FullTextIndex implements WithFind {
           }
         }
         if (attr.type._class === core.class.Collection) {
-          // we need attached documents to be in clases
+          // we need attached documents to be in classes
           const dsc = this.hierarchy.getDescendants(attr.attributeOf)
           classes = classes.concat(dsc)
         }
diff --git a/server/core/src/indexer/field.ts b/server/core/src/indexer/field.ts
index 6d327c72b6..1e336dcf59 100644
--- a/server/core/src/indexer/field.ts
+++ b/server/core/src/indexer/field.ts
@@ -24,19 +24,13 @@ import core, {
   MeasureContext,
   Ref,
   ServerStorage,
-  Storage,
-  WithLookup
+  Storage
 } from '@hcengineering/core'
 import { deepEqual } from 'fast-equals'
 import { IndexedDoc } from '../types'
+import { contentStageId, DocUpdateHandler, fieldStateId, FullTextPipeline, FullTextPipelineStage } from './types'
 import {
-  contentStageId,
-  DocUpdateHandler,
-  fieldStateId as fieldStageId,
-  FullTextPipeline,
-  FullTextPipelineStage
-} from './types'
-import {
+  collectPropagate,
   docKey,
   docUpdKey,
   getContent,
@@ -51,7 +45,7 @@ import {
  */
 export class IndexedFieldStage implements FullTextPipelineStage {
   require = []
-  stageId = fieldStageId
+  stageId = fieldStateId
   // Do not clear downloaded content
   clearExcept: string[] = [contentStageId]
 
@@ -65,11 +59,11 @@ export class IndexedFieldStage implements FullTextPipelineStage {
 
   indexState?: IndexStageState
 
-  constructor (private readonly dbStorage: ServerStorage, readonly metrics: MeasureContext) {}
+  constructor (private readonly dbStorage: ServerStorage) {}
 
   async initialize (storage: Storage, pipeline: FullTextPipeline): Promise<void> {
     const indexable = (
-      await pipeline.model.findAll(core.class.Class, { [core.mixin.FullTextSearchContext + '.propogate']: true })
+      await pipeline.model.findAll(core.class.Class, { [core.mixin.FullTextSearchContext + '.propagate']: true })
     ).map((it) => it._id)
 
     const forceIndexing = (
@@ -92,7 +86,7 @@ export class IndexedFieldStage implements FullTextPipelineStage {
     return { docs: [], pass: true }
   }
 
-  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline): Promise<void> {
+  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline, metrics: MeasureContext): Promise<void> {
     const byClass = toIndex.reduce<Record<Ref<Class<Doc>>, DocIndexState[]>>((p, c) => {
       p[c.objectClass] = [...(p[c.objectClass] ?? []), c]
       return p
@@ -104,14 +98,14 @@ export class IndexedFieldStage implements FullTextPipelineStage {
       // Obtain real documents
       const valueIds = new Map(values.map((it) => [it._id, it]))
       const objClass = v as Ref<Class<Doc>>
-      const docs = await this.dbStorage.findAll(this.metrics, objClass, {
+      const docs = await this.dbStorage.findAll(metrics, objClass, {
         _id: { $in: Array.from(valueIds.keys()) }
       })
       const attributes = getFullTextAttributes(pipeline.hierarchy, objClass)
 
       // Child docs.
 
-      let allChilds: DocIndexState[] | undefined
+      let allChildDocs: DocIndexState[] | undefined
 
       for (const doc of docs) {
         if (pipeline.cancelling) {
@@ -126,46 +120,53 @@ export class IndexedFieldStage implements FullTextPipelineStage {
 
           const docUpdate: DocumentUpdate<DocIndexState> = {}
 
-          const chainDocUpdate: DocumentUpdate<DocIndexState> = {}
-          const chainDocAllUpdate: DocumentUpdate<DocIndexState> = {}
           let changes = 0
 
+          // Convert previous child fields to just
+          for (const [k] of Object.entries(docState.attributes)) {
+            const { attr, docId, _class } = extractDocKey(k)
+            if (
+              (docId !== undefined && attr !== '') ||
+              (_class !== undefined && !pipeline.hierarchy.isDerived(docState.objectClass, _class))
+            ) {
+              // If it some previous indexed field.
+              // ;(docUpdate as any)[docUpdKey(k)] = null
+              ;(docUpdate as any).$unset = { ...((docUpdate as any).$unset ?? {}), [docUpdKey(k)]: '' }
+            }
+          }
+
           for (const [, v] of Object.entries(content)) {
             // Check for content changes and collect update
             const dKey = docKey(v.attr.name, { _class: v.attr.attributeOf })
             const dUKey = docUpdKey(v.attr.name, { _class: v.attr.attributeOf })
 
-            ;(chainDocAllUpdate as any)[dUKey] = v.value
-            // Full reindex in case stage value is changed
+            // Full re-index in case stage value is changed
             if (!deepEqual(docState.attributes[dKey], v.value)) {
               changes++
               ;(docUpdate as any)[dUKey] = v.value
-              ;(chainDocUpdate as any)[docUpdKey(v.attr.name, { _class: v.attr.attributeOf, docId: docState._id })] =
-                v.value
             }
           }
           if (docState.attachedTo != null && changes > 0) {
-            // We need to clear field stage from parent, so it will be re indexed.
-            await pipeline.update(docState.attachedTo as Ref<DocIndexState>, false, chainDocUpdate)
+            const ctx = getFullTextContext(pipeline.hierarchy, objClass)
+            if (ctx.parentPropagate ?? true) {
+              // We need to clear field stage from parent, so it will be re indexed.
+              await pipeline.update(docState.attachedTo as Ref<DocIndexState>, false, {})
+            }
           }
 
-          const propogate: Ref<Class<Doc>>[] = this.collectPropogate(pipeline, docState, doc)
-          if (propogate.length > 0) {
-            // We need to propagate all changes to all childs of following clasess.
-            if (allChilds === undefined) {
-              allChilds = await this.dbStorage.findAll(
-                this.metrics.newChild('propogate', {}),
-                core.class.DocIndexState,
-                { attachedTo: { $in: docs.map((it) => it._id) } }
-              )
+          const propagate: Ref<Class<Doc>>[] = collectPropagate(pipeline, docState.objectClass)
+          if (propagate.length > 0) {
+            // We need to propagate all changes to all child's of following classes.
+            if (allChildDocs === undefined) {
+              allChildDocs = await this.dbStorage.findAll(metrics.newChild('propagate', {}), core.class.DocIndexState, {
+                attachedTo: { $in: docs.map((it) => it._id) }
+              })
             }
-            const childs = allChilds.filter((it) => it.attachedTo === docState._id)
+            const childs = allChildDocs.filter((it) => it.attachedTo === docState._id)
             for (const u of childs) {
-              pipeline.add(u)
-              if (u.attributes.incremental === true) {
-                await pipeline.update(u._id, false, chainDocUpdate)
-              } else {
-                await pipeline.update(u._id, false, { ...chainDocAllUpdate, [docUpdKey('incremental')]: true })
+              if (propagate.some((it) => pipeline.hierarchy.isDerived(u.objectClass, it))) {
+                pipeline.add(u)
+                await pipeline.update(u._id, false, {})
               }
             }
           }
@@ -186,39 +187,6 @@ export class IndexedFieldStage implements FullTextPipelineStage {
     }
   }
 
-  private collectPropogate (
-    pipeline: FullTextPipeline,
-    docState: DocIndexState,
-    doc: WithLookup<Doc>
-  ): Ref<Class<Doc>>[] {
-    const desc = new Set(pipeline.hierarchy.getDescendants(docState.objectClass))
-    let propogate: Ref<Class<Doc>>[] = []
-    const ftContext = getFullTextContext(pipeline.hierarchy, docState.objectClass)
-    if (ftContext.propogate !== undefined) {
-      propogate = [...ftContext.propogate]
-    }
-
-    // Add all parent mixins as well
-    for (const a of pipeline.hierarchy.getAncestors(docState.objectClass)) {
-      const dsca = pipeline.hierarchy.getDescendants(a)
-      for (const dd of dsca) {
-        if (pipeline.hierarchy.isMixin(dd)) {
-          desc.add(dd)
-        }
-      }
-    }
-
-    for (const d of desc) {
-      if (pipeline.hierarchy.isMixin(d) && pipeline.hierarchy.hasMixin(doc, d)) {
-        const mContext = getFullTextContext(pipeline.hierarchy, d)
-        if (mContext.propogate !== undefined) {
-          propogate = [...propogate, ...mContext.propogate]
-        }
-      }
-    }
-    return propogate
-  }
-
   async remove (docs: DocIndexState[], pipeline: FullTextPipeline): Promise<void> {
     for (const doc of docs) {
       if (doc.attachedTo !== undefined) {
diff --git a/server/core/src/indexer/fulltextPush.ts b/server/core/src/indexer/fulltextPush.ts
index e1dc9564ed..005a95b9ee 100644
--- a/server/core/src/indexer/fulltextPush.ts
+++ b/server/core/src/indexer/fulltextPush.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import {
+import core, {
   Class,
   Doc,
   DocIndexState,
@@ -22,6 +22,7 @@ import {
   extractDocKey,
   MeasureContext,
   Ref,
+  ServerStorage,
   Storage,
   WorkspaceId
 } from '@hcengineering/core'
@@ -35,7 +36,7 @@ import {
   FullTextPipelineStage,
   fullTextPushStageId
 } from './types'
-import { docKey } from './utils'
+import { collectPropagate, docKey, getFullTextContext } from './utils'
 
 /**
  * @public
@@ -57,9 +58,9 @@ export class FullTextPushStage implements FullTextPipelineStage {
   stageValue: boolean | string = true
 
   constructor (
+    private readonly dbStorage: ServerStorage,
     readonly fulltextAdapter: FullTextAdapter,
-    readonly workspace: WorkspaceId,
-    readonly metrics: MeasureContext
+    readonly workspace: WorkspaceId
   ) {}
 
   async initialize (storage: Storage, pipeline: FullTextPipeline): Promise<void> {
@@ -94,41 +95,78 @@ export class FullTextPushStage implements FullTextPipelineStage {
     return { docs: [], pass: true }
   }
 
-  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline): Promise<void> {
+  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline, metrics: MeasureContext): Promise<void> {
     const bulk: IndexedDoc[] = []
-    for (const doc of toIndex) {
-      if (pipeline.cancelling) {
-        return
-      }
-      if (pipeline.cancelling) {
-        return
-      }
 
-      try {
+    const part = [...toIndex]
+    while (part.length > 0) {
+      const toIndexPart = part.splice(0, 1000)
+
+      const allChildDocs = await this.dbStorage.findAll(metrics.newChild('find-child', {}), core.class.DocIndexState, {
+        attachedTo: { $in: toIndexPart.map((it) => it._id) }
+      })
+
+      for (const doc of toIndexPart) {
+        if (pipeline.cancelling) {
+          return
+        }
+        if (pipeline.cancelling) {
+          return
+        }
+
         const elasticDoc = createElasticDoc(doc)
-        updateDoc2Elastic(doc.attributes, elasticDoc)
-        this.checkIntegrity(elasticDoc)
-        bulk.push(elasticDoc)
-      } catch (err: any) {
-        const wasError = (doc as any).error !== undefined
+        try {
+          updateDoc2Elastic(doc.attributes, elasticDoc)
 
-        await pipeline.update(doc._id, false, { [docKey('error')]: JSON.stringify({ message: err.message, err }) })
-        if (wasError) {
+          // Include all child attributes
+          const childDocs = allChildDocs.filter((it) => it.attachedTo === doc._id)
+          if (childDocs.length > 0) {
+            for (const c of childDocs) {
+              const ctx = getFullTextContext(pipeline.hierarchy, c.objectClass)
+              if (ctx.parentPropagate ?? true) {
+                updateDoc2Elastic(c.attributes, elasticDoc, c._id)
+              }
+            }
+          }
+
+          if (doc.attachedToClass != null && doc.attachedTo != null) {
+            const propagate: Ref<Class<Doc>>[] = collectPropagate(pipeline, doc.attachedToClass)
+            if (propagate.some((it) => pipeline.hierarchy.isDerived(doc.objectClass, it))) {
+              // We need to include all parent content into this one.
+              const [parentDoc] = await this.dbStorage.findAll(
+                metrics.newChild('propagate', {}),
+                core.class.DocIndexState,
+                { _id: doc.attachedTo as Ref<DocIndexState> }
+              )
+              if (parentDoc !== undefined) {
+                updateDoc2Elastic(parentDoc.attributes, elasticDoc, parentDoc._id)
+              }
+            }
+          }
+
+          this.checkIntegrity(elasticDoc)
+          bulk.push(elasticDoc)
+        } catch (err: any) {
+          const wasError = (doc as any).error !== undefined
+
+          await pipeline.update(doc._id, false, { [docKey('error')]: JSON.stringify({ message: err.message, err }) })
+          if (wasError) {
+            continue
+          }
+          // Print error only first time, and update it in doc index
+          console.error(err)
           continue
         }
-        // Print error only first time, and update it in doc index
-        console.error(err)
-        continue
       }
-    }
-    // Perform bulk update to elastic
-    try {
-      await this.fulltextAdapter.updateMany(bulk)
-    } catch (err: any) {
-      console.error(err)
-    }
-    for (const doc of toIndex) {
-      await pipeline.update(doc._id, true, {})
+      // Perform bulk update to elastic
+      try {
+        await this.fulltextAdapter.updateMany(bulk)
+      } catch (err: any) {
+        console.error(err)
+      }
+      for (const doc of toIndex) {
+        await pipeline.update(doc._id, true, {})
+      }
     }
   }
 
@@ -156,14 +194,22 @@ export function createElasticDoc (upd: DocIndexState): IndexedDoc {
   }
   return doc
 }
-function updateDoc2Elastic (attributes: Record<string, any>, doc: IndexedDoc): IndexedDoc {
+function updateDoc2Elastic (attributes: Record<string, any>, doc: IndexedDoc, docIdOverride?: Ref<DocIndexState>): void {
   for (const [k, v] of Object.entries(attributes)) {
-    const { _class, attr, docId, extra } = extractDocKey(k)
+    if (v == null) {
+      continue
+    }
+    let { _class, attr, docId, extra } = extractDocKey(k)
+    if (attr.length === 0) {
+      continue
+    }
 
     let vv: any = v
-    if (extra.includes('base64')) {
+    if (vv != null && extra.includes('base64')) {
       vv = Buffer.from(v, 'base64').toString()
     }
+
+    docId = docIdOverride ?? docId
     if (docId === undefined) {
       doc[k] = vv
       continue
@@ -171,8 +217,10 @@ function updateDoc2Elastic (attributes: Record<string, any>, doc: IndexedDoc): I
     const docIdAttr = '|' + docKey(attr, { _class, extra: extra.filter((it) => it !== 'base64') })
     if (vv !== null) {
       // Since we replace array of values, we could ignore null
-      doc[docIdAttr] = [...(doc[docIdAttr] ?? []), vv]
+      doc[docIdAttr] = [...(doc[docIdAttr] ?? [])]
+      if (vv !== '') {
+        doc[docIdAttr].push(vv)
+      }
     }
   }
-  return doc
 }
diff --git a/server/core/src/indexer/indexer.ts b/server/core/src/indexer/indexer.ts
index 9a4745dd38..f6d6f466ac 100644
--- a/server/core/src/indexer/indexer.ts
+++ b/server/core/src/indexer/indexer.ts
@@ -16,20 +16,20 @@
 import core, {
   AttachedDoc,
   Class,
+  DOMAIN_DOC_INDEX_STATE,
   Doc,
   DocIndexState,
   DocumentQuery,
   DocumentUpdate,
-  DOMAIN_DOC_INDEX_STATE,
   Hierarchy,
   MeasureContext,
   ModelDb,
   Ref,
   ServerStorage,
-  setObjectValue,
   TxFactory,
   WorkspaceId,
-  _getOperator
+  _getOperator,
+  setObjectValue
 } from '@hcengineering/core'
 import { DbAdapter } from '../adapter'
 import type { IndexedDoc } from '../types'
@@ -91,13 +91,13 @@ export class FullTextIndexPipeline implements FullTextPipeline {
   }
 
   async cancel (): Promise<void> {
-    console.log('Cancel indexing', this.indexId, this.workspace)
+    console.log(this.workspace.name, 'Cancel indexing', this.indexId)
     this.cancelling = true
     clearTimeout(this.skippedReiterationTimeout)
     this.triggerIndexing()
     await this.indexing
     await this.flush(true)
-    console.log('Indexing canceled', this.indexId, this.workspace)
+    console.log(this.workspace.name, 'Indexing canceled', this.indexId)
   }
 
   async markRemove (doc: DocIndexState): Promise<void> {
@@ -130,7 +130,15 @@ export class FullTextIndexPipeline implements FullTextPipeline {
   async flush (force = false): Promise<void> {
     if (this.pending.size > 0 && (this.pending.size >= 50 || force)) {
       // Push all pending changes to storage.
-      await this.storage.update(DOMAIN_DOC_INDEX_STATE, this.pending)
+      try {
+        await this.storage.update(DOMAIN_DOC_INDEX_STATE, this.pending)
+      } catch (err: any) {
+        console.error(err)
+        // Go one by one.
+        for (const o of this.pending) {
+          await this.storage.update(DOMAIN_DOC_INDEX_STATE, new Map([o]))
+        }
+      }
       this.pending.clear()
     }
   }
@@ -204,7 +212,7 @@ export class FullTextIndexPipeline implements FullTextPipeline {
     if (udoc !== undefined && this.currentStage !== undefined) {
       const stageId = this.currentStage.stageId
       // Update current stage, value
-      update.stages = { ...(udoc.stages ?? {}) }
+      update.stages = this.filterCurrentStages(udoc)
       update.stages[stageId] = mark
 
       if (this.currentStage.clearExcept !== undefined) {
@@ -218,7 +226,7 @@ export class FullTextIndexPipeline implements FullTextPipeline {
       // Filter unsupported stages
       udoc.stages = update.stages
 
-      this.stats[stageId] = (this.stats[stageId] ?? 0) + 1
+      this.currentStages[stageId] = (this.currentStages[stageId] ?? 0) + 1
       this.stageChanged++
     }
 
@@ -234,7 +242,17 @@ export class FullTextIndexPipeline implements FullTextPipeline {
 
   triggerIndexing = (): void => {}
   skippedReiterationTimeout: any
-  stats: Record<string, number> = {}
+  currentStages: Record<string, number> = {}
+
+  private filterCurrentStages (udoc: DocIndexState): Record<string, string | boolean> {
+    const result: Record<string, string | boolean> = {}
+    for (const [k, v] of Object.entries(udoc.stages ?? {})) {
+      if (this.currentStages[k] !== undefined) {
+        result[k] = v
+      }
+    }
+    return result
+  }
 
   private async stageUpdate (udoc: DocIndexState, update: DocumentUpdate<DocIndexState>): Promise<void> {
     for (const u of this.currentStage?.updateFields ?? []) {
@@ -255,27 +273,56 @@ export class FullTextIndexPipeline implements FullTextPipeline {
   broadcastClasses = new Set<Ref<Class<Doc>>>()
   updateBroadcast: any = undefined
 
+  indexesCreated = false
+
   async doIndexing (): Promise<void> {
     // Check model is upgraded to support indexer.
 
+    if (!this.indexesCreated) {
+      this.indexesCreated = true
+      // We need to be sure we have individual indexes per stage.
+      for (const st of this.stages) {
+        await this.storage.createIndexes(DOMAIN_DOC_INDEX_STATE, {
+          indexes: [
+            {
+              ['stages.' + st.stageId]: 1
+            },
+            {
+              _class: 1,
+              _id: 1,
+              ['stages.' + st.stageId]: 1,
+              removed: 1
+            }
+          ]
+        })
+      }
+    }
+
     try {
       this.hierarchy.getClass(core.class.DocIndexState)
     } catch (err: any) {
-      console.log('Models is not upgraded to support indexer', this.indexId, this.workspace)
+      console.log(this.workspace.name, 'Models is not upgraded to support indexer', this.indexId)
       return
     }
-    await this.initStates()
-    while (!this.cancelling) {
-      await this.initializeStages()
-      await this.processRemove()
+    await this.metrics.with('init-states', {}, async () => await this.initStates())
+
+    while (!this.cancelling) {
+      await this.metrics.with('initialize-stages', {}, async () => await this.initializeStages())
+
+      await this.metrics.with('process-remove', {}, async () => await this.processRemove())
+
+      const _classes = await rateLimitter.exec(() => {
+        return this.metrics.with('init-stages', {}, async () => await this.processIndex())
+      })
+
+      // Also update doc index state queries.
+      _classes.push(core.class.DocIndexState)
 
-      console.log('Indexing:', this.indexId, this.workspace)
-      const _classes = await rateLimitter.exec(() => this.processIndex())
       _classes.forEach((it) => this.broadcastClasses.add(it))
 
       if (this.toIndex.size === 0 || this.stageChanged === 0) {
         if (this.toIndex.size === 0) {
-          console.log(`${this.workspace.name} Indexing complete`, this.indexId)
+          console.log(this.workspace.name, 'Indexing complete', this.indexId)
         }
         if (!this.cancelling) {
           // We need to send index update event
@@ -300,7 +347,7 @@ export class FullTextIndexPipeline implements FullTextPipeline {
         }
       }
     }
-    console.log('Exit indexer', this.indexId, this.workspace)
+    console.log(this.workspace.name, 'Exit indexer', this.indexId)
   }
 
   private async processIndex (): Promise<Ref<Class<Doc>>[]> {
@@ -316,30 +363,36 @@ export class FullTextIndexPipeline implements FullTextPipeline {
           if (!st.enabled) {
             break
           }
-          await this.flush(true)
+          await this.metrics.with('flush', {}, async () => await this.flush(true))
           const toSkip = Array.from(this.skipped.entries())
             .filter((it) => it[1] > 3)
             .map((it) => it[0])
 
-          const result = await this.storage.findAll(
-            core.class.DocIndexState,
-            {
-              [`stages.${st.stageId}`]: { $nin: [st.stageValue] },
-              _id: { $nin: toSkip },
-              removed: false
-            },
-            {
-              limit: globalIndexer.processingSize,
-              sort: {
-                modifiedOn: 1
-              }
-            }
+          const result = await this.metrics.with(
+            'get-to-index',
+            {},
+            async () =>
+              await this.storage.findAll(
+                core.class.DocIndexState,
+                {
+                  [`stages.${st.stageId}`]: { $ne: st.stageValue },
+                  _id: { $nin: toSkip },
+                  removed: false
+                },
+                {
+                  limit: globalIndexer.processingSize,
+                  sort: {
+                    _id: 1
+                  }
+                }
+              )
           )
 
           if (result.length > 0) {
             console.log(
-              `Fulltext: Indexing ${this.indexId} ${this.workspace.name} ${st.stageId}`,
-              Object.entries(this.stats)
+              this.workspace.name,
+              `Full text: Indexing ${this.indexId} ${st.stageId}`,
+              Object.entries(this.currentStages)
                 .map((it) => `${it[0]}:${it[1]}`)
                 .join(' '),
               result.total
@@ -359,16 +412,25 @@ export class FullTextIndexPipeline implements FullTextPipeline {
           if (toIndex.length > 0) {
             // Do Indexing
             this.currentStage = st
-            await st.collect(toIndex, this)
+
+            await this.metrics.with(
+              'collect',
+              { collector: st.stageId },
+              async (ctx) => await st.collect(toIndex, this, ctx)
+            )
+
             toIndex.forEach((it) => _classUpdate.add(it.objectClass))
 
             // go with next stages if they accept it
-
             for (const nst of this.stages.slice(idx)) {
               const toIndex2 = this.matchStates(nst)
               if (toIndex2.length > 0) {
                 this.currentStage = nst
-                await nst.collect(toIndex2, this)
+                await this.metrics.with(
+                  'collect',
+                  { collector: nst.stageId },
+                  async (ctx) => await nst.collect(toIndex2, this, ctx)
+                )
               }
             }
           } else {
@@ -443,19 +505,9 @@ export class FullTextIndexPipeline implements FullTextPipeline {
   }
 
   private async initStates (): Promise<void> {
-    const statistics = await this.storage.findAll(core.class.DocIndexState, {}, { projection: { stages: 1 } })
-    this.stats = {}
-    const allStageIds = new Set(this.stages.map((it) => it.stageId))
-
+    this.currentStages = {}
     for (const st of this.stages) {
-      this.stats[st.stageId] = 0
-    }
-    for (const st of statistics) {
-      for (const [s, v] of Object.entries(st.stages ?? {})) {
-        if (v !== false && allStageIds.has(s)) {
-          this.stats[s] = (this.stats[s] ?? 0) + 1
-        }
-      }
+      this.currentStages[st.stageId] = 0
     }
   }
 
@@ -480,7 +532,7 @@ export class FullTextIndexPipeline implements FullTextPipeline {
       }
 
       if (!isClassIndexable(this.hierarchy, c)) {
-        // No need, since no indixable fields or attachments.
+        // No need, since no indexable fields or attachments.
         continue
       }
 
@@ -490,6 +542,9 @@ export class FullTextIndexPipeline implements FullTextPipeline {
       ).map((it) => it._id)
 
       while (true) {
+        if (this.cancelling) {
+          return
+        }
         const newDocs: DocIndexState[] = (
           await dbStorage.findAll<Doc>(
             this.metrics,
@@ -528,7 +583,7 @@ export class FullTextIndexPipeline implements FullTextPipeline {
       await this.storage.clean(DOMAIN_DOC_INDEX_STATE, docIds)
     }
 
-    // Clean for non existing clases
+    // Clean for non existing classes
 
     const unknownClasses = (
       await this.storage.findAll(
diff --git a/server/core/src/indexer/summary.ts b/server/core/src/indexer/summary.ts
index c3e815e5bc..a04adc1ec6 100644
--- a/server/core/src/indexer/summary.ts
+++ b/server/core/src/indexer/summary.ts
@@ -24,19 +24,21 @@ import core, {
   Hierarchy,
   IndexStageState,
   isFullTextAttribute,
+  MeasureContext,
   Ref,
+  ServerStorage,
   Storage
 } from '@hcengineering/core'
 import { translate } from '@hcengineering/platform'
 import { convert } from 'html-to-text'
 import { IndexedDoc } from '../types'
 import { contentStageId, DocUpdateHandler, fieldStateId, FullTextPipeline, FullTextPipelineStage } from './types'
-import { getFullTextContext, loadIndexStageStage } from './utils'
+import { collectPropagate, getFullTextContext, loadIndexStageStage } from './utils'
 
 /**
  * @public
  */
-export const summaryStageId = 'sum-v3a'
+export const summaryStageId = 'sum-v4'
 
 /**
  * @public
@@ -60,6 +62,11 @@ export class FullSummaryStage implements FullTextPipelineStage {
 
   indexState?: IndexStageState
 
+  // Summary should be not a bigger what 1mb of data.
+  summaryLimit = 1024 * 1024
+
+  constructor (private readonly dbStorage: ServerStorage) {}
+
   async initialize (storage: Storage, pipeline: FullTextPipeline): Promise<void> {
     const indexable = (
       await pipeline.model.findAll(core.class.Class, { [core.mixin.FullTextSearchContext + '.fullTextSummary']: true })
@@ -80,29 +87,79 @@ export class FullSummaryStage implements FullTextPipelineStage {
     return { docs: [], pass: true }
   }
 
-  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline): Promise<void> {
-    for (const doc of toIndex) {
-      if (pipeline.cancelling) {
-        return
+  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline, metrics: MeasureContext): Promise<void> {
+    const part = [...toIndex]
+    while (part.length > 0) {
+      const toIndexPart = part.splice(0, 1000)
+
+      const allChildDocs = await this.dbStorage.findAll(
+        metrics.newChild('fulltext-find-child', {}),
+        core.class.DocIndexState,
+        { attachedTo: { $in: toIndexPart.map((it) => it._id) } }
+      )
+
+      for (const doc of toIndexPart) {
+        if (pipeline.cancelling) {
+          return
+        }
+
+        const needIndex = isIndexingRequired(pipeline, doc)
+
+        // No need to index this class, mark embeddings as empty ones.
+        if (!needIndex) {
+          await pipeline.update(doc._id, this.stageValue, {})
+          continue
+        }
+
+        const update: DocumentUpdate<DocIndexState> = {}
+
+        let embeddingText = await extractIndexedValues(doc, pipeline.hierarchy, {
+          matchExtra: this.matchExtra,
+          fieldFilter: this.fieldFilter
+        })
+
+        // Include all child attributes
+        const childDocs = allChildDocs.filter((it) => it.attachedTo === doc._id)
+        if (childDocs.length > 0) {
+          for (const c of childDocs) {
+            const ctx = getFullTextContext(pipeline.hierarchy, c.objectClass)
+            if (ctx.parentPropagate ?? true) {
+              if (embeddingText.length > this.summaryLimit) {
+                break
+              }
+              embeddingText += await extractIndexedValues(c, pipeline.hierarchy, {
+                matchExtra: this.matchExtra,
+                fieldFilter: this.fieldFilter
+              })
+            }
+          }
+        }
+
+        if (doc.attachedToClass != null && doc.attachedTo != null) {
+          const propagate: Ref<Class<Doc>>[] = collectPropagate(pipeline, doc.attachedToClass)
+          if (propagate.some((it) => pipeline.hierarchy.isDerived(doc.objectClass, it))) {
+            // We need to include all parent content into this one.
+            const [parentDoc] = await this.dbStorage.findAll(
+              metrics.newChild('propagate', {}),
+              core.class.DocIndexState,
+              { _id: doc.attachedTo as Ref<DocIndexState> }
+            )
+            if (parentDoc !== undefined) {
+              if (embeddingText.length > this.summaryLimit) {
+                break
+              }
+              embeddingText += await extractIndexedValues(parentDoc, pipeline.hierarchy, {
+                matchExtra: this.matchExtra,
+                fieldFilter: this.fieldFilter
+              })
+            }
+          }
+        }
+
+        update.fullSummary = embeddingText
+
+        await pipeline.update(doc._id, this.stageValue, update)
       }
-
-      const needIndex = isIndexingRequired(pipeline, doc)
-
-      // No need to index this class, mark embeddings as empty ones.
-      if (!needIndex) {
-        await pipeline.update(doc._id, this.stageValue, {})
-        continue
-      }
-
-      const update: DocumentUpdate<DocIndexState> = {}
-
-      const embeddingText = await extractIndexedValues(doc, pipeline.hierarchy, {
-        matchExtra: this.matchExtra,
-        fieldFilter: this.fieldFilter
-      })
-      update.fullSummary = embeddingText
-
-      await pipeline.update(doc._id, this.stageValue, update)
     }
   }
 
@@ -137,8 +194,14 @@ export async function extractIndexedValues (
   const currentReplacement: Record<string, string> = {}
 
   for (const [k, v] of Object.entries(doc.attributes)) {
+    if (v == null) {
+      continue
+    }
     try {
       const { _class, attr, extra, docId } = extractDocKey(k)
+      if (docId !== undefined) {
+        continue
+      }
 
       let sourceContent = `${v as string}`.trim()
       if (extra.includes('base64')) {
@@ -181,7 +244,7 @@ export async function extractIndexedValues (
         continue
       }
       if (keyAttr.type._class === core.class.TypeAttachment && extra.length === 0) {
-        // Skipt attachment id values.
+        // Skip attachment id values.
         continue
       }
 
diff --git a/server/core/src/indexer/types.ts b/server/core/src/indexer/types.ts
index 9245b3947b..c1c31eaeed 100644
--- a/server/core/src/indexer/types.ts
+++ b/server/core/src/indexer/types.ts
@@ -20,6 +20,7 @@ import {
   DocumentQuery,
   DocumentUpdate,
   Hierarchy,
+  MeasureContext,
   ModelDb,
   Ref,
   Storage
@@ -70,7 +71,7 @@ export interface FullTextPipelineStage {
   // If specified, will clear all stages except specified + current
   clearExcept?: string[]
 
-  // Will propogate some changes for both mark values.
+  // Will propagate some changes for both mark values.
   updateFields: DocUpdateHandler[]
 
   enabled: boolean
@@ -80,7 +81,7 @@ export interface FullTextPipelineStage {
   initialize: (storage: Storage, pipeline: FullTextPipeline) => Promise<void>
 
   // Collect all changes related to bulk of document states
-  collect: (docs: DocIndexState[], pipeline: FullTextPipeline) => Promise<void>
+  collect: (docs: DocIndexState[], pipeline: FullTextPipeline, ctx: MeasureContext) => Promise<void>
 
   // Handle remove of items.
   remove: (docs: DocIndexState[], pipeline: FullTextPipeline) => Promise<void>
@@ -101,9 +102,9 @@ export const contentStageId = 'cnt-v2b'
 /**
  * @public
  */
-export const fieldStateId = 'fld-v3'
+export const fieldStateId = 'fld-v4'
 
 /**
  * @public
  */
-export const fullTextPushStageId = 'fts-v1'
+export const fullTextPushStageId = 'fts-v2'
diff --git a/server/core/src/indexer/utils.ts b/server/core/src/indexer/utils.ts
index f25b5a1965..90c6da4d07 100644
--- a/server/core/src/indexer/utils.ts
+++ b/server/core/src/indexer/utils.ts
@@ -41,6 +41,7 @@ import core, {
 } from '@hcengineering/core'
 import { deepEqual } from 'fast-equals'
 import plugin from '../plugin'
+import { FullTextPipeline } from './types'
 /**
  * @public
  */
@@ -234,6 +235,38 @@ export function getFullTextContext (
   return {
     fullTextSummary: false,
     forceIndex: false,
-    propogate: []
+    propagate: []
   }
 }
+
+/**
+ * @public
+ */
+export function collectPropagate (pipeline: FullTextPipeline, objectClass: Ref<Class<Doc>>): Ref<Class<Doc>>[] {
+  const desc = new Set(pipeline.hierarchy.getDescendants(objectClass))
+  const propagate = new Set<Ref<Class<Doc>>>()
+
+  const ftContext = getFullTextContext(pipeline.hierarchy, objectClass)
+  ftContext?.propagate?.forEach((it) => propagate.add(it))
+
+  // Add all parent mixins as well
+  for (const a of pipeline.hierarchy.getAncestors(objectClass)) {
+    const ftContext = getFullTextContext(pipeline.hierarchy, a)
+    ftContext?.propagate?.forEach((it) => propagate.add(it))
+
+    const dsca = pipeline.hierarchy.getDescendants(a)
+    for (const dd of dsca) {
+      if (pipeline.hierarchy.isMixin(dd)) {
+        desc.add(dd)
+      }
+    }
+  }
+
+  for (const d of desc) {
+    if (pipeline.hierarchy.isMixin(d)) {
+      const mContext = getFullTextContext(pipeline.hierarchy, d)
+      mContext?.propagate?.forEach((it) => propagate.add(it))
+    }
+  }
+  return Array.from(propagate.values())
+}
diff --git a/server/core/src/storage.ts b/server/core/src/storage.ts
index 0ca412b05a..87da098e95 100644
--- a/server/core/src/storage.ts
+++ b/server/core/src/storage.ts
@@ -327,7 +327,11 @@ class TServerStorage implements ServerStorage {
       if (query?.$search !== undefined) {
         return ctx.with('full-text-find-all', {}, (ctx) => this.fulltext.findAll(ctx, clazz, query, options))
       }
-      return ctx.with('db-find-all', { _class: clazz, domain }, () =>
+      const q: Record<string, any> = { _class: clazz }
+      for (const [k] of Object.entries(query)) {
+        q[k] = '...'
+      }
+      return ctx.with('db-find-all', { q: JSON.stringify(q) }, () =>
         this.getAdapter(domain).findAll(clazz, query, options)
       )
     })
@@ -831,6 +835,7 @@ export async function createServerStorage (
     }
     const stages = conf.fulltextAdapter.stages(fulltextAdapter, storage, storageAdapter, contentAdapter)
     console.timeLog(conf.workspace.name, 'finish index pipeline stages')
+
     const indexer = new FullTextIndexPipeline(
       defaultAdapter,
       stages,
diff --git a/server/elastic/src/adapter.ts b/server/elastic/src/adapter.ts
index cc2bece329..8ceb45626c 100644
--- a/server/elastic/src/adapter.ts
+++ b/server/elastic/src/adapter.ts
@@ -18,6 +18,7 @@ import {
   Class,
   Doc,
   DocumentQuery,
+  IndexingConfiguration,
   MeasureContext,
   Ref,
   toWorkspaceString,
@@ -27,6 +28,7 @@ import {
 import type { EmbeddingSearchOption, FullTextAdapter, IndexedDoc } from '@hcengineering/server-core'
 
 import { Client, errors as esErr } from '@elastic/elasticsearch'
+import { Domain } from 'node:domain'
 class ElasticAdapter implements FullTextAdapter {
   constructor (
     private readonly client: Client,
@@ -34,6 +36,8 @@ class ElasticAdapter implements FullTextAdapter {
     private readonly _metrics: MeasureContext
   ) {}
 
+  async createIndexes (domain: Domain, config: Pick<IndexingConfiguration<Doc>, 'indexes'>): Promise<void> {}
+
   async initMapping (field?: { key: string, dims: number }): Promise<Record<string, number>> {
     // const current = await this.client.indices.getMapping({})
     // console.log('Mappings', current)
diff --git a/server/elastic/src/backup.ts b/server/elastic/src/backup.ts
index 30c86b3142..d2be53067b 100644
--- a/server/elastic/src/backup.ts
+++ b/server/elastic/src/backup.ts
@@ -24,6 +24,7 @@ import core, {
   FindResult,
   FullTextData,
   Hierarchy,
+  IndexingConfiguration,
   Ref,
   Space,
   StorageIterator,
@@ -53,6 +54,8 @@ class ElasticDataAdapter implements DbAdapter {
 
   async init (model: Tx[]): Promise<void> {}
 
+  async createIndexes (domain: Domain, config: Pick<IndexingConfiguration<Doc>, 'indexes'>): Promise<void> {}
+
   async close (): Promise<void> {
     await this.client.close()
   }
diff --git a/server/front/src/index.ts b/server/front/src/index.ts
index 7c77bf08de..c09909f493 100644
--- a/server/front/src/index.ts
+++ b/server/front/src/index.ts
@@ -330,47 +330,52 @@ export function start (
             }
           : {}
 
-      https.get(url, options, (response) => {
-        console.log('status', response.statusCode)
-        if (response.statusCode !== 200) {
-          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-          res.status(500).send(`server returned ${response.statusCode}`)
-          return
-        }
-        const id = uuid()
-        const contentType = response.headers['content-type']
-        const meta = {
-          'Content-Type': contentType
-        }
-        const data: Buffer[] = []
-        response
-          .on('data', function (chunk) {
-            data.push(chunk)
-          })
-          .on('end', function () {
-            const buffer = Buffer.concat(data)
-            config.minio
-              .put(payload.workspace, id, buffer, 0, meta)
-              .then(async (objInfo) => {
-                console.log('uploaded uuid', id, objInfo.etag)
+      https
+        .get(url, options, (response) => {
+          console.log('status', response.statusCode)
+          if (response.statusCode !== 200) {
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+            res.status(500).send(`server returned ${response.statusCode}`)
+            return
+          }
+          const id = uuid()
+          const contentType = response.headers['content-type']
+          const meta = {
+            'Content-Type': contentType
+          }
+          const data: Buffer[] = []
+          response
+            .on('data', function (chunk) {
+              data.push(chunk)
+            })
+            .on('end', function () {
+              const buffer = Buffer.concat(data)
+              config.minio
+                .put(payload.workspace, id, buffer, 0, meta)
+                .then(async (objInfo) => {
+                  console.log('uploaded uuid', id, objInfo.etag)
 
-                res.status(200).send({
-                  id,
-                  contentType,
-                  size: buffer.length
+                  res.status(200).send({
+                    id,
+                    contentType,
+                    size: buffer.length
+                  })
                 })
-              })
-              .catch((err) => {
-                if (err !== null) {
-                  console.log('minio putObject error', err)
-                  res.status(500).send(err)
-                }
-              })
-          })
-          .on('error', function (err) {
-            res.status(500).send(err)
-          })
-      })
+                .catch((err) => {
+                  if (err !== null) {
+                    console.log('minio putObject error', err)
+                    res.status(500).send(err)
+                  }
+                })
+            })
+            .on('error', function (err) {
+              res.status(500).send(err)
+            })
+        })
+        .on('error', (e) => {
+          console.error(e)
+          res.status(500).send(e)
+        })
     } catch (error) {
       console.log(error)
       res.status(500).send()
diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts
index aac8bc94b0..967c7ce1e0 100644
--- a/server/mongo/src/storage.ts
+++ b/server/mongo/src/storage.ts
@@ -28,6 +28,7 @@ import core, {
   FindOptions,
   FindResult,
   Hierarchy,
+  IndexingConfiguration,
   isOperator,
   Lookup,
   Mixin,
@@ -97,6 +98,16 @@ abstract class MongoAdapterBase implements DbAdapter {
 
   async init (): Promise<void> {}
 
+  async createIndexes (domain: Domain, config: Pick<IndexingConfiguration<Doc>, 'indexes'>): Promise<void> {
+    for (const vv of config.indexes) {
+      try {
+        await this.db.collection(domain).createIndex(vv)
+      } catch (err: any) {
+        console.error(err)
+      }
+    }
+  }
+
   async tx (...tx: Tx[]): Promise<TxResult> {
     return {}
   }
@@ -338,10 +349,10 @@ abstract class MongoAdapterBase implements DbAdapter {
 
   private async fillSortPipeline<T extends Doc>(
     clazz: Ref<Class<T>>,
-    options: FindOptions<T>,
+    options: FindOptions<T> | undefined,
     pipeline: any[]
   ): Promise<void> {
-    if (options.sort !== undefined) {
+    if (options?.sort !== undefined) {
       const sort = {} as any
       for (const _key in options.sort) {
         const key = this.translateKey(_key, clazz)
@@ -369,12 +380,12 @@ abstract class MongoAdapterBase implements DbAdapter {
   private async findWithPipeline<T extends Doc>(
     clazz: Ref<Class<T>>,
     query: DocumentQuery<T>,
-    options: FindOptions<T>
+    options?: FindOptions<T>
   ): Promise<FindResult<T>> {
     const pipeline = []
     const match = { $match: this.translateQuery(clazz, query) }
-    const slowPipeline = isLookupQuery(query) || isLookupSort(options.sort)
-    const steps = await this.getLookups(clazz, options.lookup)
+    const slowPipeline = isLookupQuery(query) || isLookupSort(options?.sort)
+    const steps = await this.getLookups(clazz, options?.lookup)
     if (slowPipeline) {
       for (const step of steps) {
         pipeline.push({ $lookup: step })
@@ -383,7 +394,7 @@ abstract class MongoAdapterBase implements DbAdapter {
     pipeline.push(match)
     const resultPipeline: any[] = []
     await this.fillSortPipeline(clazz, options, pipeline)
-    if (options.limit !== undefined) {
+    if (options?.limit !== undefined) {
       resultPipeline.push({ $limit: options.limit })
     }
     if (!slowPipeline) {
@@ -402,11 +413,7 @@ abstract class MongoAdapterBase implements DbAdapter {
     pipeline.push({
       $facet: {
         results: resultPipeline,
-        totalCount: [
-          {
-            $count: 'count'
-          }
-        ]
+        ...(options?.total === true ? { totalCount: [{ $count: 'count' }] } : {})
       }
     })
     const domain = this.hierarchy.getDomain(clazz)
@@ -414,9 +421,9 @@ abstract class MongoAdapterBase implements DbAdapter {
     cursor.maxTimeMS(30000)
     const res = (await cursor.toArray())[0]
     const result = res.results as WithLookup<T>[]
-    const total = res.totalCount?.shift()?.count
+    const total = res.totalCount?.shift()?.count ?? -1
     for (const row of result) {
-      await this.fillLookupValue(clazz, options.lookup, row)
+      await this.fillLookupValue(clazz, options?.lookup, row)
       this.clearExtraLookups(row)
     }
     return toFindResult(result, total)
@@ -525,7 +532,7 @@ abstract class MongoAdapterBase implements DbAdapter {
       }
       cursor = cursor.project(projection)
     }
-    let total: number | undefined
+    let total: number = -1
     if (options !== null && options !== undefined) {
       if (options.sort !== undefined) {
         const sort: Sort = {}
@@ -537,7 +544,9 @@ abstract class MongoAdapterBase implements DbAdapter {
         cursor = cursor.sort(sort)
       }
       if (options.limit !== undefined) {
-        total = await coll.countDocuments(mongoQuery)
+        if (options.total === true) {
+          total = await coll.countDocuments(mongoQuery)
+        }
         cursor = cursor.limit(options.limit)
       }
     }
@@ -611,14 +620,18 @@ abstract class MongoAdapterBase implements DbAdapter {
       if (ops.length > 0) {
         const part = ops.splice(0, 500)
         await coll.bulkWrite(
-          part.map((it) => ({
-            updateOne: {
-              filter: { _id: it[0] },
-              update: {
-                $set: it[1]
+          part.map((it) => {
+            const { $unset, ...set } = it[1] as any
+            return {
+              updateOne: {
+                filter: { _id: it[0] },
+                update: {
+                  $set: set,
+                  ...($unset !== undefined ? { $unset } : {})
+                }
               }
             }
-          }))
+          })
         )
       }
     } catch (err: any) {
diff --git a/server/server/src/metrics.ts b/server/server/src/metrics.ts
index a11db54cf5..7e4fafbbba 100644
--- a/server/server/src/metrics.ts
+++ b/server/server/src/metrics.ts
@@ -6,7 +6,7 @@ const apmUrl = process.env.APM_SERVER_URL
 const metricsFile = process.env.METRICS_FILE
 const metricsConsole = (process.env.METRICS_CONSOLE ?? 'false') === 'true'
 
-const METRICS_UPDATE_INTERVAL = 60000
+const METRICS_UPDATE_INTERVAL = !metricsConsole ? 1000 : 60000
 
 /**
  * @public
@@ -31,7 +31,7 @@ export function getMetricsContext (): MeasureContext {
       let oldMetricsValue = ''
 
       const intTimer = setInterval(() => {
-        const val = metricsToString(metrics)
+        const val = metricsToString(metrics, 'System', 140)
         if (val !== oldMetricsValue) {
           oldMetricsValue = val
           if (metricsFile !== undefined) {
diff --git a/server/server/src/minio.ts b/server/server/src/minio.ts
index 9390537d49..6efb311a3e 100644
--- a/server/server/src/minio.ts
+++ b/server/server/src/minio.ts
@@ -23,6 +23,7 @@ import core, {
   FindOptions,
   FindResult,
   Hierarchy,
+  IndexingConfiguration,
   ModelDb,
   Ref,
   Space,
@@ -51,6 +52,8 @@ class MinioBlobAdapter implements DbAdapter {
 
   async init (model: Tx[]): Promise<void> {}
 
+  async createIndexes (domain: Domain, config: Pick<IndexingConfiguration<Doc>, 'indexes'>): Promise<void> {}
+
   async close (): Promise<void> {}
 
   find (domain: Domain): StorageIterator {
diff --git a/server/translate/src/retranslate.ts b/server/translate/src/retranslate.ts
index 2a5712fce4..e23a8c304d 100644
--- a/server/translate/src/retranslate.ts
+++ b/server/translate/src/retranslate.ts
@@ -63,7 +63,7 @@ export class LibRetranslateStage implements TranslationStage {
 
   indexState?: IndexStageState
 
-  constructor (readonly metrics: MeasureContext, readonly workspaceId: WorkspaceId) {}
+  constructor (readonly workspaceId: WorkspaceId) {}
 
   async initialize (storage: Storage, pipeline: FullTextPipeline): Promise<void> {
     // Just do nothing
@@ -106,7 +106,7 @@ export class LibRetranslateStage implements TranslationStage {
     }
   }
 
-  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline): Promise<void> {
+  async collect (toIndex: DocIndexState[], pipeline: FullTextPipeline, metrics: MeasureContext): Promise<void> {
     if (!this.enabled) {
       return
     }
diff --git a/server/ws/src/server.ts b/server/ws/src/server.ts
index 249c1147c1..42fbacdb29 100644
--- a/server/ws/src/server.ts
+++ b/server/ws/src/server.ts
@@ -14,6 +14,7 @@
 //
 
 import core, {
+  metricsAggregate,
   generateId,
   MeasureContext,
   Ref,
@@ -26,7 +27,7 @@ import core, {
 import { readRequest, Response, serialize, UNAUTHORIZED, unknownError } from '@hcengineering/platform'
 import type { Pipeline, SessionContext } from '@hcengineering/server-core'
 import { decodeToken, Token } from '@hcengineering/server-token'
-import { createServer, IncomingMessage } from 'http'
+import { createServer, IncomingMessage, ServerResponse } from 'http'
 import WebSocket, { RawData, WebSocketServer } from 'ws'
 import { BroadcastCall, PipelineFactory, Session } from './types'
 
@@ -51,7 +52,7 @@ interface Workspace {
 }
 
 class SessionManager {
-  private readonly workspaces = new Map<string, Workspace>()
+  readonly workspaces = new Map<string, Workspace>()
 
   constructor (readonly sessionFactory: (token: Token, pipeline: Pipeline, broadcast: BroadcastCall) => Session) {}
 
@@ -80,7 +81,7 @@ class SessionManager {
     }
 
     if (token.extra?.model === 'upgrade') {
-      if (LOGGING_ENABLED) console.log('reloading workspace', JSON.stringify(token))
+      if (LOGGING_ENABLED) console.log(token.workspace.name, 'reloading workspace', JSON.stringify(token))
       this.upgradeId = sessionId
       // If upgrade client is used.
       // Drop all existing clients
@@ -92,7 +93,7 @@ class SessionManager {
         workspace.sessions = []
         workspace.upgrade = token.extra?.model === 'upgrade'
       }
-      if (LOGGING_ENABLED) console.log('no sessions for workspace', wsString)
+      if (LOGGING_ENABLED) console.log(token.workspace.name, 'no sessions for workspace', wsString)
       // Re-create pipeline.
       workspace.pipeline = pipelineFactory(ctx, token.workspace, true, (tx) =>
         this.broadcastAll(workspace as Workspace, tx)
@@ -117,6 +118,7 @@ class SessionManager {
       if (existingSession !== undefined) {
         if (LOGGING_ENABLED) {
           console.log(
+            token.workspace.name,
             'found existing session',
             token.email,
             existingSession[0].sessionId,
@@ -198,7 +200,7 @@ class SessionManager {
     code: number,
     reason: string
   ): Promise<void> {
-    if (LOGGING_ENABLED) console.log(`closing websocket, code: ${code}, reason: ${reason}`)
+    if (LOGGING_ENABLED) console.log(workspaceId.name, `closing websocket, code: ${code}, reason: ${reason}`)
     const wsid = toWorkspaceString(workspaceId)
     const workspace = this.workspaces.get(wsid)
     if (workspace === undefined) {
@@ -217,7 +219,7 @@ class SessionManager {
       }
       if (workspace.sessions.length === 0) {
         const wsUID = workspace.id
-        if (LOGGING_ENABLED) console.log('no sessions for workspace', wsid, wsUID)
+        if (LOGGING_ENABLED) console.log(workspaceId.name, 'no sessions for workspace', wsid, wsUID)
 
         const waitAndClose = async (workspace: Workspace): Promise<void> => {
           try {
@@ -231,7 +233,7 @@ class SessionManager {
             if (LOGGING_ENABLED) console.timeLog(workspaceId.name, 'Closed workspace', wsUID)
           } catch (err: any) {
             this.workspaces.delete(wsid)
-            if (LOGGING_ENABLED) console.error(err)
+            if (LOGGING_ENABLED) console.error(workspaceId.name, err)
           }
         }
         workspace.closing = waitAndClose(workspace)
@@ -305,7 +307,7 @@ class SessionManager {
       console.error(new Error('internal: cannot find sessions'))
       return
     }
-    if (LOGGING_ENABLED) console.log(`server broadcasting to ${workspace.sessions.length} clients...`)
+    if (LOGGING_ENABLED) console.log(workspaceId.name, `server broadcasting to ${workspace.sessions.length} clients...`)
     const msg = serialize(resp)
     for (const session of workspace.sessions) {
       if (session[0] !== from) {
@@ -336,7 +338,7 @@ async function handleRequest<S extends Session> (
     ws.close(0, 'upgrade')
     return
   }
-  const userCtx = ctx.newChild(service.getUser(), { userId: service.getUser() }) as SessionContext
+  const userCtx = ctx.newChild('client', { workspace }) as SessionContext
   userCtx.sessionId = service.sessionInstanceId ?? ''
   const f = (service as any)[request.method]
   let timeout: any
@@ -449,14 +451,19 @@ export function start (
       }
       // remove session after 1seconds, give a time to reconnect.
       if (code === 1000) {
-        if (LOGGING_ENABLED) console.log(`client "${token.email}" closed normally`)
+        if (LOGGING_ENABLED) console.log(token.workspace.name, `client "${token.email}" closed normally`)
         void sessions.close(ctx, ws, token.workspace, code, reason.toString())
       } else {
         if (LOGGING_ENABLED) {
-          console.log(`client "${token.email}" closed abnormally, waiting reconnect`, code, reason.toString())
+          console.log(
+            token.workspace.name,
+            `client "${token.email}" closed abnormally, waiting reconnect`,
+            code,
+            reason.toString()
+          )
         }
         session.closeTimeout = setTimeout(() => {
-          if (LOGGING_ENABLED) console.log(`client "${token.email}" force closed`)
+          if (LOGGING_ENABLED) console.log(token.workspace.name, `client "${token.email}" force closed`)
           void sessions.close(ctx, ws, token.workspace, code, reason.toString())
         }, 10000)
       }
@@ -469,6 +476,36 @@ export function start (
   })
 
   const server = createServer()
+
+  server.on('request', (request: IncomingMessage, response: ServerResponse) => {
+    const url = new URL('http://localhost' + (request.url ?? ''))
+
+    const token = url.pathname.substring(1)
+    try {
+      const payload = decodeToken(token ?? '')
+      console.log(payload.workspace, 'statistics request')
+
+      response.writeHead(200, {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Methods': 'GET, OPTIONS',
+        'Access-Control-Allow-Headers': 'Content-Type'
+      })
+      const data = {
+        metrics: metricsAggregate((ctx as any).metrics),
+        activeSessions: {}
+      }
+      for (const [k, v] of sessions.workspaces) {
+        ;(data.activeSessions as any)[k] = v.sessions.length
+      }
+      const json = JSON.stringify(data)
+      response.end(json)
+    } catch (err) {
+      response.writeHead(404, {})
+      response.end()
+    }
+  })
+
   server.on('upgrade', (request: IncomingMessage, socket: any, head: Buffer) => {
     const url = new URL('http://localhost' + (request.url ?? ''))
     const token = url.pathname.substring(1)
@@ -476,7 +513,7 @@ export function start (
     try {
       const payload = decodeToken(token ?? '')
       const sessionId = url.searchParams.get('sessionId')
-      if (LOGGING_ENABLED) console.log('client connected with payload', payload, sessionId)
+      if (LOGGING_ENABLED) console.log(payload.workspace.name, 'client connected with payload', payload, sessionId)
 
       if (payload.workspace.productId !== productId) {
         throw new Error('Invalid workspace product')