diff --git a/.vscode/launch.json b/.vscode/launch.json
index 090cdf176a..7c1bf86405 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -100,6 +100,7 @@
         "ACCOUNTS_URL": "http://localhost:3000",
         "UPLOAD_URL": "/files",
         "SERVER_PORT": "8087",
+        "VERSION": null,
         "COLLABORATOR_URL": "ws://localhost:3078",
         "COLLABORATOR_API_URL": "http://localhost:3078",
         "CALENDAR_URL": "http://localhost:8095",
diff --git a/common/scripts/version.txt b/common/scripts/version.txt
index 0fa1e44bad..2974978539 100644
--- a/common/scripts/version.txt
+++ b/common/scripts/version.txt
@@ -1 +1 @@
-"0.6.270"
\ No newline at end of file
+"0.6.271"
\ No newline at end of file
diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml
index d8fb0b1c6d..23377590e8 100644
--- a/dev/docker-compose.yaml
+++ b/dev/docker-compose.yaml
@@ -77,6 +77,7 @@ services:
       - ACCOUNTS_URL=http://account:3000
       - UPLOAD_URL=/files
       - MONGO_URL=mongodb://mongodb:27017?compressors=snappy
+      - 'MONGO_OPTIONS={"appName":"collaborator","maxPoolSize":2}'
       - STORAGE_CONFIG=${STORAGE_CONFIG}
     restart: unless-stopped
   front:
@@ -95,6 +96,7 @@ services:
       - SERVER_PORT=8080
       - SERVER_SECRET=secret
       - MONGO_URL=mongodb://mongodb:27017?compressors=snappy
+      - 'MONGO_OPTIONS={"appName":"front","maxPoolSize":1}'
       - ACCOUNTS_URL=http://localhost:3000
       - UPLOAD_URL=/files      
       - ELASTIC_URL=http://elastic:9200
@@ -135,6 +137,7 @@ services:
       - ENABLE_COMPRESSION=true
       - ELASTIC_URL=http://elastic:9200
       - MONGO_URL=mongodb://mongodb:27017?compressors=snappy
+      - 'MONGO_OPTIONS={"appName": "transactor", "maxPoolSize": 1}'
       - METRICS_CONSOLE=false
       - METRICS_FILE=metrics.txt
       - STORAGE_CONFIG=${STORAGE_CONFIG}
@@ -165,6 +168,7 @@ services:
     environment:
       - SECRET=secret
       - MONGO_URL=mongodb://mongodb:27017?compressors=snappy
+      - 'MONGO_OPTIONS={"appName":"print","maxPoolSize":1}'
       - STORAGE_CONFIG=${STORAGE_CONFIG}
     deploy:
       resources:
@@ -181,6 +185,7 @@ services:
     environment:
       - SECRET=secret
       - MONGO_URL=mongodb://mongodb:27017
+      - 'MONGO_OPTIONS={"appName":"sign","maxPoolSize":1}'
       - MINIO_ENDPOINT=minio
       - MINIO_ACCESS_KEY=minioadmin
       - ACCOUNTS_URL=http://account:3000
@@ -201,6 +206,7 @@ services:
       - SECRET=secret
       - PORT=4007
       - MONGO_URL=mongodb://mongodb:27017
+      - 'MONGO_OPTIONS={"appName":"analytics","maxPoolSize":1}'
       - SERVICE_ID=analytics-collector-service
       - ACCOUNTS_URL=http://account:3000
       - SUPPORT_WORKSPACE=support
diff --git a/dev/prod/public/config.json b/dev/prod/public/config.json
index 97c6971b9b..46d9f904a3 100644
--- a/dev/prod/public/config.json
+++ b/dev/prod/public/config.json
@@ -15,6 +15,6 @@
   "SIGN_URL": "http://localhost:4006",
   "ANALYTICS_COLLECTOR_URL": "http://localhost:4077",
   "BRANDING_URL": "/branding.json",
-  "VERSION": "0.6.266",
-  "MODEL_VERSION": "0.6.266"
+  "VERSION": null,
+  "MODEL_VERSION": null
 }
\ No newline at end of file
diff --git a/models/core/src/security.ts b/models/core/src/security.ts
index c4934e58c0..fa694867e3 100644
--- a/models/core/src/security.ts
+++ b/models/core/src/security.ts
@@ -70,6 +70,7 @@ export class TSpace extends TDoc implements Space {
     archived!: boolean
 
   @Prop(ArrOf(TypeRef(core.class.Account)), core.string.Members)
+  @Index(IndexKind.Indexed)
     members!: Arr<Ref<Account>>
 
   @Prop(ArrOf(TypeRef(core.class.Account)), core.string.Owners)
diff --git a/models/preference/src/index.ts b/models/preference/src/index.ts
index c6cfc8477b..0e2ae21cae 100644
--- a/models/preference/src/index.ts
+++ b/models/preference/src/index.ts
@@ -39,6 +39,6 @@ export function createModel (builder: Builder): void {
 
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_PREFERENCE,
-    disabled: [{ modifiedOn: 1 }, { createdOn: 1 }]
+    disabled: [{ modifiedOn: 1 }, { createdOn: 1 }, { attachedTo: 1 }, { createdOn: -1 }, { modifiedBy: 1 }]
   })
 }
diff --git a/models/tags/src/index.ts b/models/tags/src/index.ts
index 64a2531fc2..ffc707da9b 100644
--- a/models/tags/src/index.ts
+++ b/models/tags/src/index.ts
@@ -148,6 +148,7 @@ export function createModel (builder: Builder): void {
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_TAGS,
     disabled: [
+      { _class: 1 },
       { modifiedOn: 1 },
       { modifiedBy: 1 },
       { createdBy: 1 },
diff --git a/packages/core/src/measurements/metrics.ts b/packages/core/src/measurements/metrics.ts
index fbef8f77f9..d3a9ae014d 100644
--- a/packages/core/src/measurements/metrics.ts
+++ b/packages/core/src/measurements/metrics.ts
@@ -1,7 +1,6 @@
 // Basic performance metrics suite.
 
 import { MetricsData } from '.'
-import { cutObjectArray } from '../utils'
 import { FullParamsType, Metrics, ParamsType } from './types'
 
 /**
@@ -35,7 +34,7 @@ function getUpdatedTopResult (
 
   const newValue = {
     value: time,
-    params: cutObjectArray(params)
+    params
   }
 
   if (result.length > 6) {
diff --git a/packages/core/src/operations.ts b/packages/core/src/operations.ts
index 94e45c3ec9..4c70d569a7 100644
--- a/packages/core/src/operations.ts
+++ b/packages/core/src/operations.ts
@@ -487,9 +487,13 @@ export class ApplyOperations extends TxOperations {
           extraNotify
         )
       )) as Promise<TxApplyResult>)
+      const dnow = Date.now()
+      if (typeof window === 'object' && window !== null) {
+        console.log(`measure ${this.measureName}`, dnow - st, 'server time', result.serverTime)
+      }
       return {
         result: result.success,
-        time: Date.now() - st,
+        time: dnow - st,
         serverTime: result.serverTime
       }
     }
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 2fe36d2e10..075f0f535e 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -13,8 +13,9 @@
 // limitations under the License.
 //
 
-import { getEmbeddedLabel, IntlString } from '@hcengineering/platform'
+import { getEmbeddedLabel, IntlString, PlatformError, unknownError } from '@hcengineering/platform'
 import { deepEqual } from 'fast-equals'
+import { DOMAIN_BENCHMARK } from './benchmark'
 import {
   Account,
   AccountRole,
@@ -46,7 +47,6 @@ import { TxOperations } from './operations'
 import { isPredicate } from './predicate'
 import { DocumentQuery, FindResult } from './storage'
 import { DOMAIN_TX } from './tx'
-import { DOMAIN_BENCHMARK } from './benchmark'
 
 function toHex (value: number, chars: number): string {
   const result = value.toString(16)
@@ -355,7 +355,6 @@ export class DocManager<T extends Doc> implements IDocManager<T> {
 
 export class RateLimiter {
   idCounter: number = 0
-  processingQueue = new Map<number, Promise<void>>()
   last: number = 0
   rate: number
 
@@ -366,21 +365,21 @@ export class RateLimiter {
   }
 
   notify: (() => void)[] = []
+  finished: boolean = false
 
   async exec<T, B extends Record<string, any> = any>(op: (args?: B) => Promise<T>, args?: B): Promise<T> {
-    const processingId = this.idCounter++
-
-    while (this.processingQueue.size >= this.rate) {
+    if (this.finished) {
+      throw new PlatformError(unknownError('No Possible to add/exec on finished queue'))
+    }
+    while (this.notify.length >= this.rate) {
       await new Promise<void>((resolve) => {
         this.notify.push(resolve)
       })
     }
     try {
       const p = op(args)
-      this.processingQueue.set(processingId, p as Promise<void>)
       return await p
     } finally {
-      this.processingQueue.delete(processingId)
       const n = this.notify.shift()
       if (n !== undefined) {
         n()
@@ -389,7 +388,7 @@ export class RateLimiter {
   }
 
   async add<T, B extends Record<string, any> = any>(op: (args?: B) => Promise<T>, args?: B): Promise<void> {
-    if (this.processingQueue.size < this.rate) {
+    if (this.notify.length < this.rate) {
       void this.exec(op, args)
     } else {
       await this.exec(op, args)
@@ -397,7 +396,12 @@ export class RateLimiter {
   }
 
   async waitProcessing (): Promise<void> {
-    await Promise.all(this.processingQueue.values())
+    this.finished = true
+    while (this.notify.length > 0) {
+      await new Promise<void>((resolve) => {
+        this.notify.push(resolve)
+      })
+    }
   }
 }
 
diff --git a/packages/platform-rig/profiles/ui/config/rush-project.json b/packages/platform-rig/profiles/ui/config/rush-project.json
index 4b6cf6cfde..b1a8f0c8c5 100644
--- a/packages/platform-rig/profiles/ui/config/rush-project.json
+++ b/packages/platform-rig/profiles/ui/config/rush-project.json
@@ -3,7 +3,6 @@
     "temp/**", 
     ".build/**", 
     "coverage/**",
-    "**/*.svelte",
     ".build/**",
     ".validate/**",
     ".format/**",
diff --git a/packages/platform/src/i18n.ts b/packages/platform/src/i18n.ts
index b59fb3c78a..e70869bde5 100644
--- a/packages/platform/src/i18n.ts
+++ b/packages/platform/src/i18n.ts
@@ -31,8 +31,8 @@ export type Loader = (locale: string) => Promise<Record<string, string | Record<
 type Messages = Record<string, IntlString | Record<string, IntlString>>
 
 const loaders = new Map<Plugin, Loader>()
-const translations = new Map<Plugin, Messages | Status>()
-const cache = new Map<IntlString, IntlMessageFormat | Status>()
+const translations = new Map<string, Map<Plugin, Messages | Status>>()
+const cache = new Map<string, Map<IntlString, IntlMessageFormat | Status>>()
 const englishTranslationsForMissing = new Map<Plugin, Messages | Status>()
 /**
  * @public
@@ -52,10 +52,14 @@ export async function loadPluginStrings (locale: string, force: boolean = false)
     cache.clear()
   }
   for (const [plugin] of loaders) {
-    let messages = translations.get(plugin)
+    const localtTanslations = translations.get(locale) ?? new Map<Plugin, Messages | Status<any>>()
+    if (!translations.has(locale)) {
+      translations.set(locale, localtTanslations)
+    }
+    let messages = localtTanslations.get(plugin)
     if (messages === undefined || force) {
       messages = await loadTranslationsForComponent(plugin, locale)
-      translations.set(plugin, messages)
+      localtTanslations.set(plugin, messages)
     }
   }
 }
@@ -83,10 +87,14 @@ async function loadTranslationsForComponent (plugin: Plugin, locale: string): Pr
 
 async function getTranslation (id: _IdInfo, locale: string): Promise<IntlString | Status | undefined> {
   try {
-    let messages = translations.get(id.component)
+    const localtTanslations = translations.get(locale) ?? new Map<Plugin, Messages | Status<any>>()
+    if (!translations.has(locale)) {
+      translations.set(locale, localtTanslations)
+    }
+    let messages = localtTanslations.get(id.component)
     if (messages === undefined) {
       messages = await loadTranslationsForComponent(id.component, locale)
-      translations.set(id.component, messages)
+      localtTanslations.set(id.component, messages)
     }
     if (messages instanceof Status) {
       return messages
@@ -127,7 +135,11 @@ export async function translate<P extends Record<string, any>> (
   language?: string
 ): Promise<string> {
   const locale = language ?? getMetadata(platform.metadata.locale) ?? 'en'
-  const compiled = cache.get(message)
+  const localCache = cache.get(locale) ?? new Map<IntlString, IntlMessageFormat | Status>()
+  if (!cache.has(locale)) {
+    cache.set(locale, localCache)
+  }
+  const compiled = localCache.get(message)
 
   if (compiled !== undefined) {
     if (compiled instanceof Status) {
@@ -142,16 +154,16 @@ export async function translate<P extends Record<string, any>> (
       }
       const translation = (await getTranslation(id, locale)) ?? message
       if (translation instanceof Status) {
-        cache.set(message, translation)
+        localCache.set(message, translation)
         return message
       }
       const compiled = new IntlMessageFormat(translation, locale, undefined, { ignoreTag: true })
-      cache.set(message, compiled)
+      localCache.set(message, compiled)
       return compiled.format(params)
     } catch (err) {
       const status = unknownError(err)
       await setPlatformStatus(status)
-      cache.set(message, status)
+      localCache.set(message, status)
       return message
     }
   }
diff --git a/packages/presentation/src/components/DocPopup.svelte b/packages/presentation/src/components/DocPopup.svelte
index 1e79379189..e5799c6bef 100644
--- a/packages/presentation/src/components/DocPopup.svelte
+++ b/packages/presentation/src/components/DocPopup.svelte
@@ -190,6 +190,7 @@
             {size}
             icon={IconAdd}
             showTooltip={{ label: create.label }}
+            dataId={'btnAdd'}
             on:click={onCreate}
             disabled={readonly || loading}
           />
diff --git a/packages/presentation/src/components/FilePreview.svelte b/packages/presentation/src/components/FilePreview.svelte
index 4397b1173c..00988014c5 100644
--- a/packages/presentation/src/components/FilePreview.svelte
+++ b/packages/presentation/src/components/FilePreview.svelte
@@ -13,18 +13,18 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { type Blob } from '@hcengineering/core'
+  import { type Blob, type Ref } from '@hcengineering/core'
   import { Button, Component, Label, resizeObserver, deviceOptionsStore as deviceInfo } from '@hcengineering/ui'
 
   import presentation from '../plugin'
 
   import { getPreviewType, previewTypes } from '../file'
   import { BlobMetadata, FilePreviewExtension } from '../types'
+  import { getFileUrl } from '../utils'
 
-  import { getBlobSrcFor } from '../preview'
-
-  export let file: Blob
+  export let file: Ref<Blob>
   export let name: string
+  export let contentType: string
   export let metadata: BlobMetadata | undefined
   export let props: Record<string, any> = {}
   export let fit: boolean = false
@@ -35,7 +35,7 @@
   $: parentHeight = ($deviceInfo.docHeight * 80) / 100
 
   let previewType: FilePreviewExtension | undefined = undefined
-  $: void getPreviewType(file.contentType, $previewTypes).then((res) => {
+  $: void getPreviewType(contentType, $previewTypes).then((res) => {
     previewType = res
   })
 
@@ -75,7 +75,7 @@
   }
   $: updateHeight(parentWidth, parentHeight, previewType, metadata)
   $: audio = previewType && Array.isArray(previewType) && previewType[0].contentType === 'audio/*'
-  $: srcRef = getBlobSrcFor(file, name)
+  $: srcRef = getFileUrl(file, name)
 </script>
 
 <div
@@ -90,10 +90,7 @@
         <Label label={presentation.string.FailedToPreview} />
       </div>
     {:else if previewType !== undefined}
-      <Component
-        is={previewType.component}
-        props={{ value: file, name, contentType: file.contentType, metadata, ...props, fit }}
-      />
+      <Component is={previewType.component} props={{ value: file, name, contentType, metadata, ...props, fit }} />
     {:else}
       <div class="flex-col items-center flex-gap-3">
         <Label label={presentation.string.ContentTypeNotSupported} />
diff --git a/packages/presentation/src/components/FilePreviewPopup.svelte b/packages/presentation/src/components/FilePreviewPopup.svelte
index ddcf2cad2b..5952686a1f 100644
--- a/packages/presentation/src/components/FilePreviewPopup.svelte
+++ b/packages/presentation/src/components/FilePreviewPopup.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import core, { type Blob, type Ref } from '@hcengineering/core'
+  import { type Blob, type Ref } from '@hcengineering/core'
   import { getEmbeddedLabel } from '@hcengineering/platform'
   import { Button, Dialog, tooltip } from '@hcengineering/ui'
   import { createEventDispatcher, onMount } from 'svelte'
@@ -21,15 +21,15 @@
   import presentation from '../plugin'
 
   import { BlobMetadata } from '../types'
-  import { getClient } from '../utils'
-  import { getBlobSrcFor } from '../preview'
+  import { getClient, getFileUrl } from '../utils'
 
   import ActionContext from './ActionContext.svelte'
   import FilePreview from './FilePreview.svelte'
   import Download from './icons/Download.svelte'
 
-  export let file: Blob | Ref<Blob> | undefined
+  export let file: Ref<Blob> | undefined
   export let name: string
+  export let contentType: string
   export let metadata: BlobMetadata | undefined
   export let props: Record<string, any> = {}
 
@@ -53,14 +53,7 @@
     return ext.substring(0, 4).toUpperCase()
   }
 
-  let blob: Blob | undefined = undefined
-  $: void fetchBlob(file)
-
-  async function fetchBlob (file: Blob | Ref<Blob> | undefined): Promise<void> {
-    blob = typeof file === 'string' ? await client.findOne(core.class.Blob, { _id: file }) : file
-  }
-
-  $: srcRef = getBlobSrcFor(blob, name)
+  $: srcRef = file !== undefined ? getFileUrl(file, name) : undefined
 </script>
 
 <ActionContext context={{ mode: 'browser' }} />
@@ -101,8 +94,8 @@
     {/await}
   </svelte:fragment>
 
-  {#if blob !== undefined}
-    <FilePreview file={blob} {name} {metadata} {props} fit />
+  {#if file}
+    <FilePreview {file} {contentType} {name} {metadata} {props} fit />
   {/if}
 </Dialog>
 
diff --git a/packages/presentation/src/components/PDFViewer.svelte b/packages/presentation/src/components/PDFViewer.svelte
index b1570bd8ec..fcfe753c57 100644
--- a/packages/presentation/src/components/PDFViewer.svelte
+++ b/packages/presentation/src/components/PDFViewer.svelte
@@ -17,11 +17,11 @@
   import type { Blob, Ref } from '@hcengineering/core'
   import { Button, Dialog, Label, Spinner } from '@hcengineering/ui'
   import { createEventDispatcher, onMount } from 'svelte'
-  import presentation, { getBlobSrcFor } from '..'
+  import presentation, { getFileUrl } from '..'
   import ActionContext from './ActionContext.svelte'
   import Download from './icons/Download.svelte'
 
-  export let file: Blob | Ref<Blob> | undefined
+  export let file: Ref<Blob> | undefined
   export let name: string
   export let contentType: string | undefined
   // export let popupOptions: PopupOptions
@@ -45,7 +45,7 @@
   })
   let download: HTMLAnchorElement
 
-  $: srcRef = getBlobSrcFor(file, name)
+  $: srcRef = file !== undefined ? getFileUrl(file, name) : undefined
 
   $: isImage = contentType !== undefined && contentType.startsWith('image/')
 
diff --git a/packages/presentation/src/pipeline.ts b/packages/presentation/src/pipeline.ts
index 79f3fe6663..cd75ef2672 100644
--- a/packages/presentation/src/pipeline.ts
+++ b/packages/presentation/src/pipeline.ts
@@ -9,6 +9,7 @@ import {
   type FindResult,
   type Hierarchy,
   type ModelDb,
+  type QuerySelector,
   type Ref,
   type SearchOptions,
   type SearchQuery,
@@ -330,6 +331,22 @@ export class OptimizeQueryMiddleware extends BasePresentationMiddleware implemen
     const fQuery = { ...query }
     const fOptions = { ...options }
     this.optimizeQuery<T>(fQuery, fOptions)
+
+    // Immidiate response queries, if have some $in with empty list.
+
+    for (const [k, v] of Object.entries(fQuery)) {
+      if (typeof v === 'object' && v != null) {
+        const vobj = v as QuerySelector<any>
+        if (vobj.$in != null && vobj.$in.length === 0) {
+          // Emopty in, will always return []
+          return toFindResult([], 0)
+        } else if (vobj.$in != null && vobj.$in.length === 1 && Object.keys(vobj).length === 1) {
+          ;(fQuery as any)[k] = vobj.$in[0]
+        } else if (vobj.$nin != null && vobj.$nin.length === 1 && Object.keys(vobj).length === 1) {
+          ;(fQuery as any)[k] = { $ne: vobj.$nin[0] }
+        }
+      }
+    }
     return await this.provideFindAll(_class, fQuery, fOptions)
   }
 
diff --git a/packages/presentation/src/preview.ts b/packages/presentation/src/preview.ts
index 4233c89a2e..2748b849d2 100644
--- a/packages/presentation/src/preview.ts
+++ b/packages/presentation/src/preview.ts
@@ -1,99 +1,36 @@
-import type { Blob, BlobLookup, Ref } from '@hcengineering/core'
-import core, { concatLink } from '@hcengineering/core'
+import type { Blob, Ref } from '@hcengineering/core'
+import { concatLink } from '@hcengineering/core'
 import { getMetadata } from '@hcengineering/platform'
-import { getBlobHref, getClient, getCurrentWorkspaceUrl, getFileUrl } from '.'
+import { getCurrentWorkspaceUrl, getFileUrl } from '.'
 import presentation from './plugin'
 
-export interface ProviderPreviewConfig {
-  // Identifier of provider
-  // If set to '' could be applied to any provider, for example to exclude some 'image/gif' etc from being processing with providers.
-  providerId: string
-  // Preview url
-  // If '' preview is disabled for config.
-  previewUrl: string
-
-  // Content type markers, will check by containts, if passed, only allow to be used with matched content types.
-  contentTypes?: string[]
-}
-
 export interface PreviewConfig {
-  default?: ProviderPreviewConfig
-  previewers: Record<string, ProviderPreviewConfig[]>
+  previewUrl: string
 }
 
-const defaultPreview = (): ProviderPreviewConfig => ({
-  providerId: '',
-  previewUrl: `/files/${getCurrentWorkspaceUrl()}?file=:blobId&size=:size`
-})
+const defaultPreview = (): string => `/files/${getCurrentWorkspaceUrl()}?file=:blobId&size=:size`
 
 /**
  *
  * PREVIEW_CONFIG env variable format.
- * A `;` separated list of triples, providerName|previewUrl|supportedFormats.
-
-- providerName - a provider name should be same as in Storage configuration.
-  It coult be empty and it will match by content types.
-- previewUrl - an Url with :workspace, :blobId, :downloadFile, :size placeholders, they will be replaced in UI with an appropriate blob values.
-- supportedFormats - a `,` separated list of file extensions.
-- contentTypes - a ',' separated list of content type patterns.
-
+ * previewUrl - an Url with :workspace, :blobId, :downloadFile, :size placeholders, they will be replaced in UI with an appropriate blob values.
  */
 export function parsePreviewConfig (config?: string): PreviewConfig | undefined {
   if (config === undefined) {
     return
   }
-  const result: PreviewConfig = { previewers: {} }
-  const nolineData = config
-    .split('\n')
-    .map((it) => it.trim())
-    .join(';')
-  const configs = nolineData.split(';')
-  for (const c of configs) {
-    if (c === '') {
-      continue // Skip empty lines
-    }
-    const [provider, url, contentTypes] = c.split('|').map((it) => it.trim())
-    const p: ProviderPreviewConfig = {
-      providerId: provider,
-      previewUrl: url,
-      // Allow preview only for images by default
-      contentTypes:
-        contentTypes !== undefined
-          ? contentTypes
-            .split(',')
-            .map((it) => it.trim())
-            .filter((it) => it !== '')
-          : ['image/']
-    }
-
-    if (provider === '*') {
-      result.default = p
-    } else {
-      result.previewers[provider] = [...(result.previewers[provider] ?? []), p]
-    }
-  }
-  return result
+  return { previewUrl: config }
 }
 
 export function getPreviewConfig (): PreviewConfig {
   return (
     (getMetadata(presentation.metadata.PreviewConfig) as PreviewConfig) ?? {
-      default: defaultPreview(),
-      previewers: {
-        '': [
-          {
-            providerId: '',
-            contentTypes: ['image/gif', 'image/apng', 'image/svg'], // Disable gif and apng format preview.
-            previewUrl: ''
-          }
-        ]
-      }
+      previewUrl: defaultPreview()
     }
   )
 }
 
 export async function getBlobRef (
-  blob: Blob | undefined,
   file: Ref<Blob>,
   name?: string,
   width?: number
@@ -101,74 +38,30 @@ export async function getBlobRef (
     src: string
     srcset: string
   }> {
-  let _blob = blob as BlobLookup
-  if (_blob === undefined) {
-    _blob = (await getClient().findOne(core.class.Blob, { _id: file })) as BlobLookup
-  }
   return {
-    src: _blob?.downloadUrl ?? getFileUrl(file, name),
-    srcset: _blob !== undefined ? getSrcSet(_blob, width) : ''
+    src: getFileUrl(file, name),
+    srcset: getSrcSet(file, width)
   }
 }
 
-export async function getBlobSrcSet (_blob: Blob | undefined, file: Ref<Blob>, width?: number): Promise<string> {
-  if (_blob === undefined) {
-    _blob = await getClient().findOne(core.class.Blob, { _id: file })
-  }
-  return _blob !== undefined ? getSrcSet(_blob, width) : ''
+export async function getBlobSrcSet (file: Ref<Blob>, width?: number): Promise<string> {
+  return getSrcSet(file, width)
 }
 
-/**
- * Select content provider based on content type.
- */
-export function selectProvider (
-  blob: Blob,
-  providers: Array<ProviderPreviewConfig | undefined>
-): ProviderPreviewConfig | undefined {
-  const isMatched = (it: ProviderPreviewConfig): boolean =>
-    it.contentTypes === undefined || it.contentTypes.some((e) => blob.contentType === e || blob.contentType.includes(e))
-
-  let candidate: ProviderPreviewConfig | undefined
-  for (const p of providers) {
-    if (p !== undefined && isMatched(p)) {
-      if (p.previewUrl === '') {
-        // we found one disable config line, so return it.
-        return p
-      }
-      candidate = p
-    }
-  }
-
-  return candidate
+export function getSrcSet (_blob: Ref<Blob>, width?: number): string {
+  return blobToSrcSet(getPreviewConfig(), _blob, width)
 }
 
-export function getSrcSet (_blob: Blob, width?: number): string {
-  const blob = _blob as BlobLookup
-  const c = getPreviewConfig()
-
-  // Select providers from
-  const cfg = selectProvider(blob, [...(c.previewers[_blob.provider] ?? []), ...(c.previewers[''] ?? []), c.default])
-  if (cfg === undefined || cfg.previewUrl === '') {
-    return '' // No previewer is available for blob
-  }
-
-  return blobToSrcSet(cfg, blob, width)
-}
-
-function blobToSrcSet (
-  cfg: ProviderPreviewConfig,
-  blob: { _id: Ref<Blob>, downloadUrl?: string },
-  width: number | undefined
-): string {
+function blobToSrcSet (cfg: PreviewConfig, blob: Ref<Blob>, width: number | undefined): string {
   let url = cfg.previewUrl.replaceAll(':workspace', encodeURIComponent(getCurrentWorkspaceUrl()))
-  const downloadUrl = blob.downloadUrl ?? getFileUrl(blob._id)
+  const downloadUrl = getFileUrl(blob)
 
   const frontUrl = getMetadata(presentation.metadata.FrontUrl) ?? window.location.origin
   if (!url.includes('://')) {
     url = concatLink(frontUrl ?? '', url)
   }
   url = url.replaceAll(':downloadFile', encodeURIComponent(downloadUrl))
-  url = url.replaceAll(':blobId', encodeURIComponent(blob._id))
+  url = url.replaceAll(':blobId', encodeURIComponent(blob))
 
   let result = ''
   const fu = url
@@ -187,24 +80,9 @@ function blobToSrcSet (
   return result
 }
 
-export async function getBlobSrcFor (blob: Blob | Ref<Blob> | undefined, name?: string): Promise<string> {
-  return blob === undefined
-    ? ''
-    : typeof blob === 'string'
-      ? await getBlobHref(undefined, blob, name)
-      : await getBlobHref(blob, blob._id)
-}
-
 /***
  * @deprecated, please use Blob direct operations.
  */
 export function getFileSrcSet (_blob: Ref<Blob>, width?: number): string {
-  const cfg = getPreviewConfig()
-  return blobToSrcSet(
-    cfg.default ?? defaultPreview(),
-    {
-      _id: _blob
-    },
-    width
-  )
+  return blobToSrcSet(getPreviewConfig(), _blob, width)
 }
diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts
index 4ef6fb44a8..7594f3d165 100644
--- a/packages/presentation/src/utils.ts
+++ b/packages/presentation/src/utils.ts
@@ -24,7 +24,6 @@ import core, {
   type AnyAttribute,
   type ArrOf,
   type AttachedDoc,
-  type BlobLookup,
   type Class,
   type Client,
   type Collection,
@@ -450,18 +449,6 @@ export function createQuery (dontDestroy?: boolean): LiveQuery {
   return new LiveQuery(dontDestroy)
 }
 
-export async function getBlobHref (
-  _blob: PlatformBlob | undefined,
-  file: Ref<PlatformBlob>,
-  filename?: string
-): Promise<string> {
-  let blob = _blob as BlobLookup
-  if (blob?.downloadUrl === undefined) {
-    blob = (await getClient().findOne(core.class.Blob, { _id: file })) as BlobLookup
-  }
-  return blob?.downloadUrl ?? getFileUrl(file, filename)
-}
-
 export function getCurrentWorkspaceUrl (): string {
   const wsId = get(workspaceId)
   if (wsId == null) {
@@ -700,7 +687,11 @@ export function isAdminUser (): boolean {
 }
 
 export function isSpace (space: Doc): space is Space {
-  return getClient().getHierarchy().isDerived(space._class, core.class.Space)
+  return isSpaceClass(space._class)
+}
+
+export function isSpaceClass (_class: Ref<Class<Doc>>): boolean {
+  return getClient().getHierarchy().isDerived(_class, core.class.Space)
 }
 
 export function setPresentationCookie (token: string, workspaceId: string): void {
diff --git a/packages/storage/src/index.ts b/packages/storage/src/index.ts
index 253a3c4014..3cadb1b176 100644
--- a/packages/storage/src/index.ts
+++ b/packages/storage/src/index.ts
@@ -13,17 +13,7 @@
 // limitations under the License.
 //
 
-import {
-  type Blob,
-  type Branding,
-  type DocumentUpdate,
-  type MeasureContext,
-  type Ref,
-  type StorageIterator,
-  type WorkspaceId,
-  type WorkspaceIdWithUrl
-} from '@hcengineering/core'
-import type { BlobLookup } from '@hcengineering/core/src/classes'
+import { type Blob, type MeasureContext, type StorageIterator, type WorkspaceId } from '@hcengineering/core'
 import { type Readable } from 'stream'
 
 export type ListBlobResult = Omit<Blob, 'contentType' | 'version'>
@@ -38,11 +28,6 @@ export interface BlobStorageIterator {
   close: () => Promise<void>
 }
 
-export interface BlobLookupResult {
-  lookups: BlobLookup[]
-  updates?: Map<Ref<Blob>, DocumentUpdate<BlobLookup>>
-}
-
 export interface BucketInfo {
   name: string
   delete: () => Promise<void>
@@ -50,11 +35,6 @@ export interface BucketInfo {
 }
 
 export interface StorageAdapter {
-  // If specified will limit a blobs available to put into selected provider.
-  // A set of content type patterns supported by this storage provider.
-  // If not defined, will be suited for any other content types.
-  contentTypes?: string[]
-
   initialize: (ctx: MeasureContext, workspaceId: WorkspaceId) => Promise<void>
 
   close: () => Promise<void>
@@ -84,14 +64,6 @@ export interface StorageAdapter {
     offset: number,
     length?: number
   ) => Promise<Readable>
-
-  // Lookup will extend Blob with lookup information.
-  lookup: (
-    ctx: MeasureContext,
-    workspaceId: WorkspaceIdWithUrl,
-    branding: Branding | null,
-    docs: Blob[]
-  ) => Promise<BlobLookupResult>
 }
 
 export interface StorageAdapterEx extends StorageAdapter {
@@ -189,15 +161,6 @@ export class DummyStorageAdapter implements StorageAdapter, StorageAdapterEx {
   ): Promise<UploadedObjectInfo> {
     throw new Error('not implemented')
   }
-
-  async lookup (
-    ctx: MeasureContext,
-    workspaceId: WorkspaceIdWithUrl,
-    branding: Branding | null,
-    docs: Blob[]
-  ): Promise<BlobLookupResult> {
-    return { lookups: [] }
-  }
 }
 
 export function createDummyStorageAdapter (): StorageAdapter {
diff --git a/packages/ui/src/tooltips.ts b/packages/ui/src/tooltips.ts
index 14a043c543..0a3e478599 100644
--- a/packages/ui/src/tooltips.ts
+++ b/packages/ui/src/tooltips.ts
@@ -28,6 +28,10 @@ export function tooltip (node: HTMLElement, options?: LabelAndProps): any {
   if (options === undefined) {
     return {}
   }
+  if (options.label === undefined && options.component === undefined) {
+    // No tooltip
+    return {}
+  }
   let opt = options
   const show = (): void => {
     const shown = !!(storedValue.label !== undefined || storedValue.component !== undefined)
@@ -113,7 +117,7 @@ export function showTooltip (
     props,
     anchor,
     onUpdate,
-    kind,
+    kind: kind ?? 'tooltip',
     keys,
     type: 'tooltip'
   }
diff --git a/plugins/activity-resources/src/activity.ts b/plugins/activity-resources/src/activity.ts
index b48848878c..0d748dafd0 100644
--- a/plugins/activity-resources/src/activity.ts
+++ b/plugins/activity-resources/src/activity.ts
@@ -1,5 +1,5 @@
 import activity, { type ActivityMessage, type SavedMessage } from '@hcengineering/activity'
-import { type Ref, SortingOrder, type WithLookup } from '@hcengineering/core'
+import core, { type Ref, SortingOrder, type WithLookup } from '@hcengineering/core'
 import { writable } from 'svelte/store'
 import { createQuery, getClient } from '@hcengineering/presentation'
 
@@ -14,7 +14,7 @@ export function loadSavedMessages (): void {
   if (client !== undefined) {
     savedMessagesQuery.query(
       activity.class.SavedMessage,
-      {},
+      { space: core.space.Workspace },
       (res) => {
         savedMessagesStore.set(res.filter(({ $lookup }) => $lookup?.attachedTo !== undefined))
       },
diff --git a/plugins/activity-resources/src/components/Activity.svelte b/plugins/activity-resources/src/components/Activity.svelte
index f1431e5360..b2f47f38a2 100644
--- a/plugins/activity-resources/src/components/Activity.svelte
+++ b/plugins/activity-resources/src/components/Activity.svelte
@@ -13,20 +13,26 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import activity, { ActivityExtension, ActivityMessage, DisplayActivityMessage } from '@hcengineering/activity'
+  import activity, {
+    ActivityExtension,
+    ActivityMessage,
+    ActivityReference,
+    DisplayActivityMessage,
+    WithReferences
+  } from '@hcengineering/activity'
   import { Doc, Ref, SortingOrder } from '@hcengineering/core'
-  import { createQuery, getClient, isSpace } from '@hcengineering/presentation'
+  import { createQuery, getClient } from '@hcengineering/presentation'
   import { Grid, Label, Spinner, location, Lazy } from '@hcengineering/ui'
   import { onDestroy, onMount } from 'svelte'
 
   import ActivityExtensionComponent from './ActivityExtension.svelte'
   import ActivityFilter from './ActivityFilter.svelte'
-  import { combineActivityMessages } from '../activityMessagesUtils'
-  import { canGroupMessages, getMessageFromLoc } from '../utils'
+  import { combineActivityMessages, sortActivityMessages } from '../activityMessagesUtils'
+  import { canGroupMessages, getMessageFromLoc, getSpace } from '../utils'
   import ActivityMessagePresenter from './activity-message/ActivityMessagePresenter.svelte'
   import { messageInFocus } from '../activity'
 
-  export let object: Doc
+  export let object: WithReferences<Doc>
   export let showCommenInput: boolean = true
   export let transparent: boolean = false
   export let focusIndex: number = -1
@@ -34,12 +40,17 @@
 
   const client = getClient()
   const activityMessagesQuery = createQuery()
+  const refsQuery = createQuery()
 
   let extensions: ActivityExtension[] = []
 
   let filteredMessages: DisplayActivityMessage[] = []
-  let activityMessages: ActivityMessage[] = []
-  let isLoading = false
+  let allMessages: ActivityMessage[] = []
+  let messages: ActivityMessage[] = []
+  let refs: ActivityReference[] = []
+
+  let isMessagesLoading = false
+  let isRefsLoading = true
 
   let activityBox: HTMLElement | undefined
   let selectedMessageId: Ref<ActivityMessage> | undefined = undefined
@@ -163,16 +174,38 @@
     extensions = res
   })
 
+  // Load references from other spaces separately because they can have any different spaces
+  $: if ((object.references ?? 0) > 0) {
+    refsQuery.query(
+      activity.class.ActivityReference,
+      { attachedTo: object._id, space: { $ne: getSpace(object) } },
+      (res) => {
+        refs = res
+        isRefsLoading = false
+      },
+      {
+        sort: {
+          createdOn: SortingOrder.Ascending
+        }
+      }
+    )
+  } else {
+    isRefsLoading = false
+    refsQuery.unsubscribe()
+  }
+
+  $: allMessages = sortActivityMessages(messages.concat(refs))
+
   async function updateActivityMessages (objectId: Ref<Doc>, order: SortingOrder): Promise<void> {
-    isLoading = true
+    isMessagesLoading = true
 
     const res = activityMessagesQuery.query(
       activity.class.ActivityMessage,
-      { attachedTo: objectId, space: isSpace(object) ? object._id : object.space },
+      { attachedTo: objectId, space: getSpace(object) },
       (result: ActivityMessage[]) => {
-        void combineActivityMessages(result, order).then((messages) => {
-          activityMessages = messages
-          isLoading = false
+        void combineActivityMessages(result, order).then((res) => {
+          messages = res
+          isMessagesLoading = false
         })
       },
       {
@@ -182,10 +215,11 @@
       }
     )
     if (!res) {
-      isLoading = false
+      isMessagesLoading = false
     }
   }
 
+  $: isLoading = isMessagesLoading || isRefsLoading
   $: areMessagesLoaded = !isLoading && filteredMessages.length > 0
 
   $: if (activityBox && areMessagesLoaded) {
@@ -206,7 +240,7 @@
     {/if}
   </span>
   <ActivityFilter
-    messages={activityMessages}
+    messages={allMessages}
     {object}
     on:update={(e) => {
       filteredMessages = e.detail
diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessageNotificationLabel.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessageNotificationLabel.svelte
index ce68ee3e49..55ffcd0629 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessageNotificationLabel.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessageNotificationLabel.svelte
@@ -16,8 +16,8 @@
   import { Label, tooltip } from '@hcengineering/ui'
   import { DocNotifyContext } from '@hcengineering/notification'
   import activity, { ActivityMessage } from '@hcengineering/activity'
-  import { createQuery, getClient } from '@hcengineering/presentation'
-  import { Doc, Ref } from '@hcengineering/core'
+  import { getClient } from '@hcengineering/presentation'
+  import { Doc } from '@hcengineering/core'
   import { getDocLinkTitle, getDocTitle, ObjectIcon } from '@hcengineering/view-resources'
   import { getEmbeddedLabel } from '@hcengineering/platform'
   import contact from '@hcengineering/contact'
@@ -25,54 +25,44 @@
   import ActivityMessagePreview from './ActivityMessagePreview.svelte'
 
   export let context: DocNotifyContext
+  export let object: ActivityMessage
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
-  const parentQuery = createQuery()
 
-  let parentMessage: ActivityMessage | undefined = undefined
   let title: string | undefined = undefined
-  let object: Doc | undefined = undefined
-
-  $: parentQuery.query(activity.class.ActivityMessage, { _id: context.attachedTo as Ref<ActivityMessage> }, (res) => {
-    parentMessage = res[0]
-  })
-
-  $: parentMessage &&
-    client.findOne(parentMessage.attachedToClass, { _id: parentMessage.attachedTo }).then((res) => {
-      object = res
-    })
+  let doc: Doc | undefined = undefined
 
   $: object &&
-    getDocLinkTitle(client, object._id, object._class, object).then((res) => {
+    client.findOne(object.attachedToClass, { _id: object.attachedTo, space: object.space }).then((res) => {
+      doc = res
+    })
+
+  $: doc &&
+    getDocLinkTitle(client, doc._id, doc._class, doc).then((res) => {
       title = res
     })
 </script>
 
-{#if parentMessage}
-  <span class="flex-presenter flex-gap-1 font-semi-bold">
-    <Label label={(parentMessage?.replies ?? 0) > 0 ? activity.string.Thread : activity.string.Message} />
-    {#if title}
-      <span class="lower">
-        <Label label={activity.string.In} />
-      </span>
-      {#if object}
-        {#await getDocTitle(client, object._id, object._class, object) then tooltipLabel}
-          <span
-            class="flex-presenter flex-gap-0-5"
-            use:tooltip={tooltipLabel ? { label: getEmbeddedLabel(tooltipLabel) } : undefined}
-          >
-            <ObjectIcon
-              value={object}
-              size={hierarchy.isDerived(object._class, contact.class.Person) ? 'tiny' : 'small'}
-            />
-            {title}
-          </span>
-        {/await}
-      {/if}
+<span class="flex-presenter flex-gap-1 font-semi-bold">
+  <Label label={(object?.replies ?? 0) > 0 ? activity.string.Thread : activity.string.Message} />
+  {#if title}
+    <span class="lower">
+      <Label label={activity.string.In} />
+    </span>
+    {#if doc}
+      {#await getDocTitle(client, doc._id, doc._class, doc) then tooltipLabel}
+        <span
+          class="flex-presenter flex-gap-0-5"
+          use:tooltip={tooltipLabel ? { label: getEmbeddedLabel(tooltipLabel) } : undefined}
+        >
+          <ObjectIcon value={doc} size={hierarchy.isDerived(doc._class, contact.class.Person) ? 'tiny' : 'small'} />
+          {title}
+        </span>
+      {/await}
     {/if}
-  </span>
-  <span class="font-normal">
-    <ActivityMessagePreview value={parentMessage} readonly type="content-only" />
-  </span>
-{/if}
+  {/if}
+</span>
+<span class="font-normal">
+  <ActivityMessagePreview value={object} {doc} readonly type="content-only" />
+</span>
diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessagePreview.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessagePreview.svelte
index d3defd3b4b..efdb2716a9 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessagePreview.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessagePreview.svelte
@@ -21,6 +21,7 @@
 
   import activity from '../../plugin'
 
+  export let doc: Doc | undefined
   export let value: DisplayActivityMessage
   export let readonly = false
   export let type: ActivityMessagePreviewType = 'full'
@@ -44,7 +45,8 @@
       type,
       readonly,
       actions,
-      space
+      space,
+      doc
     }}
     on:click
   />
diff --git a/plugins/activity-resources/src/components/activity-reference/ReferenceContent.svelte b/plugins/activity-resources/src/components/activity-reference/ReferenceContent.svelte
index dc3dae0d68..8e2a030220 100644
--- a/plugins/activity-resources/src/components/activity-reference/ReferenceContent.svelte
+++ b/plugins/activity-resources/src/components/activity-reference/ReferenceContent.svelte
@@ -13,22 +13,10 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { createQuery, MessageViewer } from '@hcengineering/presentation'
-  import { Ref } from '@hcengineering/core'
-  import activity, { ActivityReference } from '@hcengineering/activity'
+  import { MessageViewer } from '@hcengineering/presentation'
+  import { ActivityReference } from '@hcengineering/activity'
 
-  export let _id: Ref<ActivityReference> | undefined = undefined
   export let value: ActivityReference | undefined = undefined
-
-  const query = createQuery()
-
-  $: if (value === undefined && _id !== undefined) {
-    query.query(activity.class.ActivityReference, { _id }, (res) => {
-      value = res.shift()
-    })
-  } else {
-    query.unsubscribe()
-  }
 </script>
 
 {#if value}
diff --git a/plugins/activity-resources/src/components/activity-reference/ReferenceSrcPresenter.svelte b/plugins/activity-resources/src/components/activity-reference/ReferenceSrcPresenter.svelte
index cef2abef7e..75b4b989bc 100644
--- a/plugins/activity-resources/src/components/activity-reference/ReferenceSrcPresenter.svelte
+++ b/plugins/activity-resources/src/components/activity-reference/ReferenceSrcPresenter.svelte
@@ -16,12 +16,12 @@
   import type { Doc } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
   import { DocReferencePresenter } from '@hcengineering/view-resources'
-  import activity from '../../plugin'
-
-  import { isActivityMessage } from '../../activityMessagesUtils'
   import view from '@hcengineering/view'
   import { Icon, Label } from '@hcengineering/ui'
 
+  import activity from '../../plugin'
+  import { isActivityMessage } from '../../activityMessagesUtils'
+
   export let value: Doc | undefined
 
   const client = getClient()
@@ -31,7 +31,7 @@
   $: showParent = isActivityMessage(value)
 
   $: isActivityMessage(value) &&
-    client.findOne(value.attachedToClass, { _id: value.attachedTo }).then((res) => {
+    client.findOne(value.attachedToClass, { _id: value.attachedTo, space: value.space }).then((res) => {
       parentObject = res
     })
 </script>
diff --git a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
index 2ec306b662..948ffef6a9 100644
--- a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
@@ -88,13 +88,17 @@
     attributeModel = model
   })
 
-  async function getParentMessage (_class: Ref<Class<Doc>>, _id: Ref<Doc>): Promise<ActivityMessage | undefined> {
+  async function getParentMessage (
+    _class: Ref<Class<Doc>>,
+    _id: Ref<Doc>,
+    space: Ref<Space>
+  ): Promise<ActivityMessage | undefined> {
     if (hierarchy.isDerived(_class, activity.class.ActivityMessage)) {
-      return await client.findOne(activity.class.ActivityMessage, { _id: _id as Ref<ActivityMessage> })
+      return await client.findOne(activity.class.ActivityMessage, { _id: _id as Ref<ActivityMessage>, space })
     }
   }
 
-  $: void getParentMessage(value.attachedToClass, value.attachedTo).then((res) => {
+  $: void getParentMessage(value.attachedToClass, value.attachedTo, value.space).then((res) => {
     parentMessage = res as DisplayActivityMessage
   })
 
@@ -150,6 +154,7 @@
 
     const _id = parentMessage ? parentMessage.attachedTo : message.attachedTo
     const _class = parentMessage ? parentMessage.attachedToClass : message.attachedToClass
+    const space = parentMessage ? parentMessage.space : message.space
 
     if (doc !== undefined && doc._id === _id) {
       parentObject = doc
@@ -163,7 +168,7 @@
       return
     }
 
-    parentObjectQuery.query(_class, { _id }, (res) => {
+    parentObjectQuery.query(_class, { _id, space }, (res) => {
       parentObject = res[0]
     })
   }
diff --git a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePreview.svelte b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePreview.svelte
index 36c2b23483..140ba05c86 100644
--- a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePreview.svelte
+++ b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePreview.svelte
@@ -32,6 +32,7 @@
   import DocUpdateMessageContent from './DocUpdateMessageContent.svelte'
   import DocUpdateMessageAttributes from './DocUpdateMessageAttributes.svelte'
 
+  export let doc: Doc | undefined
   export let value: DisplayDocUpdateMessage
   export let readonly = false
   export let type: ActivityMessagePreviewType = 'full'
@@ -65,15 +66,20 @@
     attributeModel = model
   })
 
-  $: viewlet?.component && loadObject(value.objectId, value.objectClass)
+  $: viewlet?.component && loadObject(value.objectId, value.objectClass, value.space, doc)
+
+  async function loadObject (_id: Ref<Doc>, _class: Ref<Class<Doc>>, space: Ref<Space>, doc?: Doc): Promise<void> {
+    if (doc?._id === _id) {
+      object = doc
+      return
+    }
 
-  async function loadObject (_id: Ref<Doc>, _class: Ref<Class<Doc>>): Promise<void> {
     const isObjectRemoved = await checkIsObjectRemoved(client, _id, _class)
 
     if (isObjectRemoved) {
       object = await buildRemovedDoc(client, _id, _class)
     } else {
-      objectQuery.query(_class, { _id }, (res) => {
+      objectQuery.query(_class, { _id, space }, (res) => {
         object = res[0]
       })
     }
diff --git a/plugins/activity-resources/src/components/reactions/ReactionPresenter.svelte b/plugins/activity-resources/src/components/reactions/ReactionPresenter.svelte
index 3ffdab1030..e90f0f73df 100644
--- a/plugins/activity-resources/src/components/reactions/ReactionPresenter.svelte
+++ b/plugins/activity-resources/src/components/reactions/ReactionPresenter.svelte
@@ -14,18 +14,19 @@
 -->
 <script lang="ts">
   import { Reaction } from '@hcengineering/activity'
-  import { Ref } from '@hcengineering/core'
+  import { Ref, Space } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
 
   import activity from '../../plugin'
 
   export let _id: Ref<Reaction>
+  export let space: Ref<Space>
   export let value: Reaction | undefined = undefined
 
   const query = createQuery()
 
   $: value === undefined &&
-    query.query(activity.class.Reaction, { _id }, (res) => {
+    query.query(activity.class.Reaction, { _id, space }, (res) => {
       value = res[0]
     })
 </script>
diff --git a/plugins/activity-resources/src/components/reactions/ReactionsPresenter.svelte b/plugins/activity-resources/src/components/reactions/ReactionsPresenter.svelte
index 1a9925fdce..a495545053 100644
--- a/plugins/activity-resources/src/components/reactions/ReactionsPresenter.svelte
+++ b/plugins/activity-resources/src/components/reactions/ReactionsPresenter.svelte
@@ -16,7 +16,7 @@
   import activity, { ActivityMessage, Reaction } from '@hcengineering/activity'
   import { createQuery, getClient } from '@hcengineering/presentation'
 
-  import { updateDocReactions } from '../../utils'
+  import { getSpace, updateDocReactions } from '../../utils'
   import Reactions from './Reactions.svelte'
 
   export let object: ActivityMessage | undefined
@@ -30,9 +30,13 @@
   $: hasReactions = object?.reactions && object.reactions > 0
 
   $: if (object && hasReactions) {
-    reactionsQuery.query(activity.class.Reaction, { attachedTo: object._id }, (res: Reaction[]) => {
-      reactions = res
-    })
+    reactionsQuery.query(
+      activity.class.Reaction,
+      { attachedTo: object._id, space: getSpace(object) },
+      (res: Reaction[]) => {
+        reactions = res
+      }
+    )
   } else {
     reactionsQuery.unsubscribe()
   }
diff --git a/plugins/activity-resources/src/components/reactions/ReactionsPreview.svelte b/plugins/activity-resources/src/components/reactions/ReactionsPreview.svelte
index cd553b34fd..9e5f5374c0 100644
--- a/plugins/activity-resources/src/components/reactions/ReactionsPreview.svelte
+++ b/plugins/activity-resources/src/components/reactions/ReactionsPreview.svelte
@@ -37,7 +37,7 @@
   $: if (message && hasReactions) {
     reactionsQuery.query(
       activity.class.Reaction,
-      { attachedTo: message._id },
+      { attachedTo: message._id, space: message.space },
       (res: Reaction[]) => {
         reactions = res
 
diff --git a/plugins/activity-resources/src/utils.ts b/plugins/activity-resources/src/utils.ts
index c1be13a8ff..cde846e3d5 100644
--- a/plugins/activity-resources/src/utils.ts
+++ b/plugins/activity-resources/src/utils.ts
@@ -1,6 +1,13 @@
 import type { ActivityMessage, Reaction } from '@hcengineering/activity'
-import core, { getCurrentAccount, isOtherHour, type Doc, type Ref, type TxOperations } from '@hcengineering/core'
-import { getClient } from '@hcengineering/presentation'
+import core, {
+  getCurrentAccount,
+  isOtherHour,
+  type Doc,
+  type Ref,
+  type TxOperations,
+  type Space
+} from '@hcengineering/core'
+import { getClient, isSpace } from '@hcengineering/presentation'
 import {
   EmojiPopup,
   closePopup,
@@ -58,7 +65,7 @@ export async function addReactionAction (
   const client = getClient()
   const reactions: Reaction[] =
     (message.reactions ?? 0) > 0
-      ? await client.findAll<Reaction>(activity.class.Reaction, { attachedTo: message._id })
+      ? await client.findAll<Reaction>(activity.class.Reaction, { attachedTo: message._id, space: message.space })
       : []
   const element = getEventPositionElement(ev)
 
@@ -169,3 +176,7 @@ export function shouldScrollToActivity (): boolean {
   const loc = getCurrentResolvedLocation()
   return getMessageFromLoc(loc) !== undefined
 }
+
+export function getSpace (doc: Doc): Ref<Space> {
+  return isSpace(doc) ? doc._id : doc.space
+}
diff --git a/plugins/activity/src/index.ts b/plugins/activity/src/index.ts
index 746e4a9410..2d0cfa0673 100644
--- a/plugins/activity/src/index.ts
+++ b/plugins/activity/src/index.ts
@@ -235,6 +235,10 @@ export interface UserMentionInfo extends AttachedDoc {
   content: string
 }
 
+export type WithReferences<T extends Doc> = T & {
+  references?: number
+}
+
 /**
  * @public
  */
diff --git a/plugins/attachment-resources/src/components/AttachmentActions.svelte b/plugins/attachment-resources/src/components/AttachmentActions.svelte
index 53002cfbe9..744fe2ccd2 100644
--- a/plugins/attachment-resources/src/components/AttachmentActions.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentActions.svelte
@@ -18,7 +18,7 @@
   import {
     FilePreviewPopup,
     canPreviewFile,
-    getBlobHref,
+    getFileUrl,
     getPreviewAlignment,
     previewTypes
   } from '@hcengineering/presentation'
@@ -71,7 +71,8 @@
     showPopup(
       FilePreviewPopup,
       {
-        file: attachment.$lookup?.file ?? attachment.file,
+        file: attachment.file,
+        contentType: attachment.type,
         name: attachment.name,
         metadata: attachment.metadata
       },
@@ -130,32 +131,30 @@
 </script>
 
 <div class="flex">
-  {#await getBlobHref(attachment.$lookup?.file, attachment.file, attachment.name) then href}
-    <a
-      class="mr-1 flex-row-center gap-2 p-1"
-      {href}
-      download={attachment.name}
-      bind:this={download}
-      use:tooltip={{ label: getEmbeddedLabel(attachment.name) }}
-      on:click|stopPropagation
-    >
-      {#if canPreview}
-        <ActionIcon
-          icon={IconOpen}
-          size={'medium'}
-          action={(evt) => {
-            showPreview(evt)
-          }}
-        />
-      {/if}
+  <a
+    class="mr-1 flex-row-center gap-2 p-1"
+    href={getFileUrl(attachment.file, attachment.name)}
+    download={attachment.name}
+    bind:this={download}
+    use:tooltip={{ label: getEmbeddedLabel(attachment.name) }}
+    on:click|stopPropagation
+  >
+    {#if canPreview}
       <ActionIcon
-        icon={FileDownload}
+        icon={IconOpen}
         size={'medium'}
-        action={() => {
-          download.click()
+        action={(evt) => {
+          showPreview(evt)
         }}
       />
-    </a>
-  {/await}
+    {/if}
+    <ActionIcon
+      icon={FileDownload}
+      size={'medium'}
+      action={() => {
+        download.click()
+      }}
+    />
+  </a>
   <ActionIcon icon={IconMoreH} size={'medium'} action={showMenu} />
 </div>
diff --git a/plugins/attachment-resources/src/components/AttachmentDocList.svelte b/plugins/attachment-resources/src/components/AttachmentDocList.svelte
index 9e7d99cc3f..335893196f 100644
--- a/plugins/attachment-resources/src/components/AttachmentDocList.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentDocList.svelte
@@ -48,11 +48,6 @@
         },
         (res) => {
           resAttachments = res
-        },
-        {
-          lookup: {
-            file: core.class.Blob
-          }
         }
       )
     } else {
diff --git a/plugins/attachment-resources/src/components/AttachmentGalleryPresenter.svelte b/plugins/attachment-resources/src/components/AttachmentGalleryPresenter.svelte
index b866e28bef..07e83fc2db 100644
--- a/plugins/attachment-resources/src/components/AttachmentGalleryPresenter.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentGalleryPresenter.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import type { Attachment } from '@hcengineering/attachment'
   import type { WithLookup } from '@hcengineering/core'
-  import { FilePreviewPopup, getBlobHref } from '@hcengineering/presentation'
+  import { FilePreviewPopup, getFileUrl } from '@hcengineering/presentation'
   import { closeTooltip, showPopup } from '@hcengineering/ui'
   import filesize from 'filesize'
   import { getType } from '../utils'
@@ -45,41 +45,27 @@
     showPopup(
       FilePreviewPopup,
       {
-        file: value.$lookup?.file ?? value.file,
+        file: value.file,
+        contentType: value.type,
         name: value.name,
         metadata: value.metadata
       },
       isImage(value.type) ? 'centered' : 'float'
     )
   }
+  $: src = getFileUrl(value.file, value.name)
 </script>
 
 <div class="gridCellOverlay">
-  {#await getBlobHref(value.$lookup?.file, value.file, value.name) then src}
-    <div class="gridCell">
-      {#if isImage(value.type)}
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
-        <!-- svelte-ignore a11y-no-static-element-interactions -->
-        <div class="cellImagePreview" on:click={openAttachment}>
-          <img class={'img-fit'} {src} alt={value.name} />
-        </div>
-      {:else}
-        <div class="cellMiscPreview">
-          {#if isEmbedded(value.type)}
-            <!-- svelte-ignore a11y-click-events-have-key-events -->
-            <!-- svelte-ignore a11y-no-static-element-interactions -->
-            <div class="flex-center extensionIcon" on:click={openAttachment}>
-              {extensionIconLabel(value.name)}
-            </div>
-          {:else}
-            <a class="no-line" href={src} download={value.name}>
-              <div class="flex-center extensionIcon">{extensionIconLabel(value.name)}</div>
-            </a>
-          {/if}
-        </div>
-      {/if}
-
-      <div class="cellInfo">
+  <div class="gridCell">
+    {#if isImage(value.type)}
+      <!-- svelte-ignore a11y-click-events-have-key-events -->
+      <!-- svelte-ignore a11y-no-static-element-interactions -->
+      <div class="cellImagePreview" on:click={openAttachment}>
+        <img class={'img-fit'} {src} alt={value.name} />
+      </div>
+    {:else}
+      <div class="cellMiscPreview">
         {#if isEmbedded(value.type)}
           <!-- svelte-ignore a11y-click-events-have-key-events -->
           <!-- svelte-ignore a11y-no-static-element-interactions -->
@@ -91,24 +77,38 @@
             <div class="flex-center extensionIcon">{extensionIconLabel(value.name)}</div>
           </a>
         {/if}
-        <div class="eCellInfoData">
-          {#if isEmbedded(value.type)}
-            <!-- svelte-ignore a11y-click-events-have-key-events -->
-            <!-- svelte-ignore a11y-no-static-element-interactions -->
-            <div class="eCellInfoFilename" on:click={openAttachment}>
-              {trimFilename(value.name)}
-            </div>
-          {:else}
-            <div class="eCellInfoFilename">
-              <a href={src} download={value.name}>{trimFilename(value.name)}</a>
-            </div>
-          {/if}
-          <div class="eCellInfoFilesize">{filesize(value.size)}</div>
-        </div>
-        <div class="eCellInfoMenu"><slot name="rowMenu" /></div>
       </div>
+    {/if}
+
+    <div class="cellInfo">
+      {#if isEmbedded(value.type)}
+        <!-- svelte-ignore a11y-click-events-have-key-events -->
+        <!-- svelte-ignore a11y-no-static-element-interactions -->
+        <div class="flex-center extensionIcon" on:click={openAttachment}>
+          {extensionIconLabel(value.name)}
+        </div>
+      {:else}
+        <a class="no-line" href={src} download={value.name}>
+          <div class="flex-center extensionIcon">{extensionIconLabel(value.name)}</div>
+        </a>
+      {/if}
+      <div class="eCellInfoData">
+        {#if isEmbedded(value.type)}
+          <!-- svelte-ignore a11y-click-events-have-key-events -->
+          <!-- svelte-ignore a11y-no-static-element-interactions -->
+          <div class="eCellInfoFilename" on:click={openAttachment}>
+            {trimFilename(value.name)}
+          </div>
+        {:else}
+          <div class="eCellInfoFilename">
+            <a href={src} download={value.name}>{trimFilename(value.name)}</a>
+          </div>
+        {/if}
+        <div class="eCellInfoFilesize">{filesize(value.size)}</div>
+      </div>
+      <div class="eCellInfoMenu"><slot name="rowMenu" /></div>
     </div>
-  {/await}
+  </div>
 </div>
 
 <style lang="scss">
diff --git a/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte b/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
index aba89abd57..78bbd44336 100644
--- a/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
@@ -107,7 +107,7 @@
 </script>
 
 <div class="container" style="width:{toStyle(dimensions.width)}; height:{toStyle(dimensions.height)}">
-  {#await getBlobRef(value.$lookup?.file, value.file, value.name, sizeToWidth(urlSize)) then blobSrc}
+  {#await getBlobRef(value.file, value.name, sizeToWidth(urlSize)) then blobSrc}
     <img
       src={blobSrc.src}
       style:object-fit={getObjectFit(dimensions)}
diff --git a/plugins/attachment-resources/src/components/AttachmentPopup.svelte b/plugins/attachment-resources/src/components/AttachmentPopup.svelte
index 08d7a45ce3..a37f5ebd20 100644
--- a/plugins/attachment-resources/src/components/AttachmentPopup.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentPopup.svelte
@@ -43,11 +43,6 @@
     },
     (res) => {
       docs = res
-    },
-    {
-      lookup: {
-        file: core.class.Blob
-      }
     }
   )
 
diff --git a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
index 52b5fc010c..f2ec4f8149 100644
--- a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
@@ -83,7 +83,8 @@
     showPopup(
       FilePreviewPopup,
       {
-        file: value.$lookup?.file ?? value.file,
+        file: value.file,
+        contentType: value.type,
         name: value.name,
         metadata: value.metadata
       },
@@ -114,7 +115,7 @@
 {:else}
   <div class="flex-row-center attachment-container">
     {#if value}
-      {#await getBlobRef(value.$lookup?.file, value.file, value.name, sizeToWidth('large')) then valueRef}
+      {#await getBlobRef(value.file, value.name, sizeToWidth('large')) then valueRef}
         <a
           class="no-line"
           style:flex-shrink={0}
diff --git a/plugins/attachment-resources/src/components/AttachmentPreview.svelte b/plugins/attachment-resources/src/components/AttachmentPreview.svelte
index e08673cd44..7a1ecea86f 100644
--- a/plugins/attachment-resources/src/components/AttachmentPreview.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentPreview.svelte
@@ -51,7 +51,7 @@
       if (listProvider !== undefined) listProvider.updateFocus(value)
       const popupInfo = showPopup(
         FilePreviewPopup,
-        { file: value.$lookup?.file ?? value.file, name: value.name },
+        { file: value.file, name: value.name, contentType: value.type },
         value.type.startsWith('image/') ? 'centered' : 'float'
       )
       dispatch('open', popupInfo.id)
diff --git a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
index d6fc6f94a7..f7ff5a939d 100644
--- a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
@@ -121,11 +121,6 @@
         (res) => {
           originalAttachments = new Set(res.map((p) => p._id))
           attachments = toIdMap(res)
-        },
-        {
-          lookup: {
-            file: core.class.Blob
-          }
         }
       )
     } else {
diff --git a/plugins/attachment-resources/src/components/AttachmentStyleBoxCollabEditor.svelte b/plugins/attachment-resources/src/components/AttachmentStyleBoxCollabEditor.svelte
index b66a691fed..dd46583877 100644
--- a/plugins/attachment-resources/src/components/AttachmentStyleBoxCollabEditor.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentStyleBoxCollabEditor.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import attachment, { Attachment, BlobMetadata } from '@hcengineering/attachment'
   import contact from '@hcengineering/contact'
-  import core, { Account, Doc, Ref, generateId, type Blob } from '@hcengineering/core'
+  import { Account, Doc, Ref, generateId, type Blob } from '@hcengineering/core'
   import { IntlString, getResource, setPlatformStatus, unknownError } from '@hcengineering/platform'
   import {
     FileOrBlob,
@@ -25,7 +25,6 @@
     getFileMetadata,
     uploadFile
   } from '@hcengineering/presentation'
-  import { getCollaborationUser, getObjectLinkFragment } from '@hcengineering/view-resources'
   import textEditor, { type RefAction, type TextEditorHandler } from '@hcengineering/text-editor'
   import {
     AttachIcon,
@@ -38,6 +37,7 @@
   import { AnySvelteComponent, getEventPositionElement, getPopupPositionElement, navigate } from '@hcengineering/ui'
   import { uploadFiles } from '@hcengineering/uploader'
   import view from '@hcengineering/view'
+  import { getCollaborationUser, getObjectLinkFragment } from '@hcengineering/view-resources'
 
   import AttachmentsGrid from './AttachmentsGrid.svelte'
 
@@ -106,11 +106,6 @@
     },
     (res) => {
       attachments = res
-    },
-    {
-      lookup: {
-        file: core.class.Blob
-      }
     }
   )
 
diff --git a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
index 0739a446aa..c87a8ad08e 100644
--- a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
@@ -13,23 +13,23 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { createEventDispatcher, onDestroy } from 'svelte'
   import { Attachment } from '@hcengineering/attachment'
-  import core, { Account, Class, Doc, generateId, Markup, Ref, Space, toIdMap, type Blob } from '@hcengineering/core'
+  import { Account, Class, Doc, generateId, Markup, Ref, Space, toIdMap, type Blob } from '@hcengineering/core'
   import { IntlString, setPlatformStatus, unknownError } from '@hcengineering/platform'
   import {
     createQuery,
-    DraftController,
     deleteFile,
+    DraftController,
     draftsStore,
     getClient,
     getFileMetadata,
     uploadFile
   } from '@hcengineering/presentation'
-  import textEditor, { type RefAction } from '@hcengineering/text-editor'
   import { EmptyMarkup } from '@hcengineering/text'
+  import textEditor, { type RefAction } from '@hcengineering/text-editor'
   import { AttachIcon, StyledTextBox } from '@hcengineering/text-editor-resources'
   import { ButtonSize } from '@hcengineering/ui'
+  import { createEventDispatcher, onDestroy } from 'svelte'
 
   import attachment from '../plugin'
   import AttachmentsGrid from './AttachmentsGrid.svelte'
@@ -127,11 +127,6 @@
           originalAttachments = new Set(res.map((p) => p._id))
           attachments = toIdMap(res)
           dispatch('attach', { action: 'saved', value: attachments.size })
-        },
-        {
-          lookup: {
-            file: core.class.Blob
-          }
         }
       )
     }
diff --git a/plugins/attachment-resources/src/components/AttachmentVideoPreview.svelte b/plugins/attachment-resources/src/components/AttachmentVideoPreview.svelte
index fdfad9ba88..61402e8d22 100644
--- a/plugins/attachment-resources/src/components/AttachmentVideoPreview.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentVideoPreview.svelte
@@ -14,9 +14,9 @@
 -->
 <script lang="ts">
   import type { Attachment } from '@hcengineering/attachment'
-  import { getBlobHref } from '@hcengineering/presentation'
 
   import type { WithLookup } from '@hcengineering/core'
+  import { getFileUrl } from '@hcengineering/presentation'
   import AttachmentPresenter from './AttachmentPresenter.svelte'
 
   export let value: WithLookup<Attachment>
@@ -58,9 +58,7 @@
 </script>
 
 <video controls width={dimensions.width} height={dimensions.height} preload={preload ? 'auto' : 'none'}>
-  {#await getBlobHref(value.$lookup?.file, value.file, value.name) then href}
-    <source src={href} />
-  {/await}
+  <source src={getFileUrl(value.file, value.name)} />
   <track kind="captions" label={value.name} />
   <div class="container">
     <AttachmentPresenter {value} />
diff --git a/plugins/attachment-resources/src/components/AttachmentsGalleryView.svelte b/plugins/attachment-resources/src/components/AttachmentsGalleryView.svelte
index 4487bb59b5..b6a9173772 100644
--- a/plugins/attachment-resources/src/components/AttachmentsGalleryView.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentsGalleryView.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import attachment, { Attachment } from '@hcengineering/attachment'
   import { Doc, getCurrentAccount, type WithLookup } from '@hcengineering/core'
-  import { getBlobHref, getClient } from '@hcengineering/presentation'
+  import { getClient, getFileUrl } from '@hcengineering/presentation'
   import { Icon, IconMoreV, Menu, showPopup } from '@hcengineering/ui'
   import { AttachmentGalleryPresenter } from '..'
   import FileDownload from './icons/FileDownload.svelte'
@@ -56,12 +56,11 @@
       <!-- svelte-ignore a11y-no-static-element-interactions -->
       <AttachmentGalleryPresenter value={attachment}>
         <svelte:fragment slot="rowMenu">
+          {@const href = getFileUrl(attachment.file, attachment.name)}
           <div class="eAttachmentCellActions" class:fixed={i === selectedFileNumber}>
-            {#await getBlobHref(attachment.$lookup?.file, attachment.file, attachment.name) then href}
-              <a {href} download={attachment.name}>
-                <Icon icon={FileDownload} size={'small'} />
-              </a>
-            {/await}
+            <a {href} download={attachment.name}>
+              <Icon icon={FileDownload} size={'small'} />
+            </a>
             <div class="eAttachmentCellMenu" on:click={(event) => showFileMenu(event, attachment, i)}>
               <IconMoreV size={'small'} />
             </div>
diff --git a/plugins/attachment-resources/src/components/AttachmentsListView.svelte b/plugins/attachment-resources/src/components/AttachmentsListView.svelte
index c41652a747..c6a4bbd48f 100644
--- a/plugins/attachment-resources/src/components/AttachmentsListView.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentsListView.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import attachment, { Attachment } from '@hcengineering/attachment'
   import { Doc, getCurrentAccount, type WithLookup } from '@hcengineering/core'
-  import { getBlobHref, getClient } from '@hcengineering/presentation'
+  import { getClient, getFileUrl } from '@hcengineering/presentation'
   import { Icon, IconMoreV, Menu, showPopup } from '@hcengineering/ui'
   import { AttachmentPresenter } from '..'
   import FileDownload from './icons/FileDownload.svelte'
@@ -51,16 +51,15 @@
 
 <div class="flex-col">
   {#each attachments as attachment, i}
+    {@const href = getFileUrl(attachment.file, attachment.name)}
     <div class="flex-between attachmentRow" class:fixed={i === selectedFileNumber}>
       <div class="item flex">
         <AttachmentPresenter value={attachment} />
       </div>
       <div class="eAttachmentRowActions" class:fixed={i === selectedFileNumber}>
-        {#await getBlobHref(attachment.$lookup?.file, attachment.file, attachment.name) then href}
-          <a {href} download={attachment.name}>
-            <Icon icon={FileDownload} size={'small'} />
-          </a>
-        {/await}
+        <a {href} download={attachment.name}>
+          <Icon icon={FileDownload} size={'small'} />
+        </a>
         <!-- svelte-ignore a11y-click-events-have-key-events -->
         <!-- svelte-ignore a11y-no-static-element-interactions -->
         <div class="eAttachmentRowMenu" on:click={(event) => showFileMenu(event, attachment, i)}>
diff --git a/plugins/attachment-resources/src/components/AudioPlayer.svelte b/plugins/attachment-resources/src/components/AudioPlayer.svelte
index 99acc3a24c..25402ebd2a 100644
--- a/plugins/attachment-resources/src/components/AudioPlayer.svelte
+++ b/plugins/attachment-resources/src/components/AudioPlayer.svelte
@@ -14,11 +14,11 @@
 -->
 <script lang="ts">
   import type { Attachment } from '@hcengineering/attachment'
-  import { getBlobHref, getFileUrl } from '@hcengineering/presentation'
-  import { CircleButton, Progress } from '@hcengineering/ui'
-  import Play from './icons/Play.svelte'
-  import Pause from './icons/Pause.svelte'
   import type { WithLookup } from '@hcengineering/core'
+  import { getFileUrl } from '@hcengineering/presentation'
+  import { CircleButton, Progress } from '@hcengineering/ui'
+  import Pause from './icons/Pause.svelte'
+  import Play from './icons/Play.svelte'
 
   export let value: WithLookup<Attachment>
   export let fullSize = false
@@ -48,9 +48,7 @@
   </div>
 </div>
 <audio bind:duration bind:currentTime={time} bind:paused>
-  {#await getBlobHref(value.$lookup?.file, value.file, value.name) then href}
-    <source src={href} type={value.type} />
-  {/await}
+  <source src={getFileUrl(value.file, value.name)} type={value.type} />
 </audio>
 
 <style lang="scss">
diff --git a/plugins/attachment-resources/src/components/FileBrowser.svelte b/plugins/attachment-resources/src/components/FileBrowser.svelte
index 14518f2d18..e65f80defc 100644
--- a/plugins/attachment-resources/src/components/FileBrowser.svelte
+++ b/plugins/attachment-resources/src/components/FileBrowser.svelte
@@ -92,10 +92,7 @@
       { ...nameQuery, ...senderQuery, ...spaceQuery, ...dateQuery, ...fileTypeQuery },
       {
         sort: sortModeToOptionObject(selectedSort_),
-        limit: 200,
-        lookup: {
-          file: core.class.Blob
-        }
+        limit: 200
       }
     )
     isLoading = false
diff --git a/plugins/attachment-resources/src/components/MediaViewer.svelte b/plugins/attachment-resources/src/components/MediaViewer.svelte
index fdd5492083..b97cbf5bdf 100644
--- a/plugins/attachment-resources/src/components/MediaViewer.svelte
+++ b/plugins/attachment-resources/src/components/MediaViewer.svelte
@@ -16,7 +16,7 @@
   // import { Doc } from '@hcengineering/core'
   import type { Attachment } from '@hcengineering/attachment'
   import type { WithLookup } from '@hcengineering/core'
-  import presentation, { ActionContext, IconDownload, getBlobHref, getBlobRef } from '@hcengineering/presentation'
+  import presentation, { ActionContext, getFileUrl, IconDownload } from '@hcengineering/presentation'
   import { Button, Dialog } from '@hcengineering/ui'
   import { createEventDispatcher, onMount } from 'svelte'
   import { getType } from '../utils'
@@ -40,7 +40,7 @@
   })
   let download: HTMLAnchorElement
   $: type = getType(value.type)
-  $: srcRef = getBlobHref(value.$lookup?.file, value.file, value.name)
+  $: srcRef = getFileUrl(value.file, value.name)
 </script>
 
 <ActionContext context={{ mode: 'browser' }} />
diff --git a/plugins/attachment-resources/src/components/Photos.svelte b/plugins/attachment-resources/src/components/Photos.svelte
index 4b72e3f0ff..c78ab056e9 100644
--- a/plugins/attachment-resources/src/components/Photos.svelte
+++ b/plugins/attachment-resources/src/components/Photos.svelte
@@ -17,14 +17,7 @@
   import { Photo } from '@hcengineering/attachment'
   import { Class, Doc, Ref, Space, type WithLookup } from '@hcengineering/core'
   import { setPlatformStatus, unknownError } from '@hcengineering/platform'
-  import {
-    FilePreviewPopup,
-    createQuery,
-    getBlobHref,
-    getClient,
-    uploadFile,
-    getBlobRef
-  } from '@hcengineering/presentation'
+  import { FilePreviewPopup, createQuery, getBlobRef, getClient, uploadFile } from '@hcengineering/presentation'
   import { Button, IconAdd, Label, Spinner, showPopup } from '@hcengineering/ui'
   import attachment from '../plugin'
   import UploadDuo from './icons/UploadDuo.svelte'
@@ -99,7 +92,7 @@
     if (item !== undefined) {
       showPopup(
         FilePreviewPopup,
-        { file: item.$lookup?.file ?? item.file, name: item.name },
+        { file: item.file, name: item.name, contentType: item.type },
         item.type.startsWith('image/') ? 'centered' : 'float'
       )
     } else {
@@ -157,7 +150,7 @@
           click(ev, image)
         }}
       >
-        {#await getBlobRef(image.$lookup?.file, image.file, image.name) then blobRef}
+        {#await getBlobRef(image.file, image.name) then blobRef}
           <img src={blobRef.src} srcset={blobRef.srcset} alt={image.name} />
         {/await}
       </div>
diff --git a/plugins/chunter-resources/src/channelDataProvider.ts b/plugins/chunter-resources/src/channelDataProvider.ts
index f96665a3b5..7334a5ad11 100644
--- a/plugins/chunter-resources/src/channelDataProvider.ts
+++ b/plugins/chunter-resources/src/channelDataProvider.ts
@@ -25,11 +25,10 @@ import {
   type Space,
   type Timestamp
 } from '@hcengineering/core'
-
 import { derived, get, type Readable, writable } from 'svelte/store'
-import { type ActivityMessage } from '@hcengineering/activity'
+import activity, { type ActivityMessage, type ActivityReference } from '@hcengineering/activity'
 import attachment from '@hcengineering/attachment'
-import { combineActivityMessages } from '@hcengineering/activity-resources'
+import { combineActivityMessages, sortActivityMessages } from '@hcengineering/activity-resources'
 import { type ChatMessage } from '@hcengineering/chunter'
 import notification, { type DocNotifyContext } from '@hcengineering/notification'
 
@@ -70,6 +69,7 @@ export class ChannelDataProvider implements IChannelDataProvider {
 
   private readonly metadataQuery = createQuery(true)
   private readonly tailQuery = createQuery(true)
+  private readonly refsQuery = createQuery(true)
 
   private chatId: Ref<Doc> | undefined = undefined
   private readonly msgClass: Ref<Class<ActivityMessage>>
@@ -79,12 +79,14 @@ export class ChannelDataProvider implements IChannelDataProvider {
   public readonly metadataStore = writable<MessageMetadata[]>([])
   private readonly tailStore = writable<ActivityMessage[]>([])
   private readonly chunksStore = writable<Chunk[]>([])
+  public readonly refsStore = writable<ActivityReference[]>([])
 
   private readonly isInitialLoadingStore = writable(false)
   private readonly isInitialLoadedStore = writable(false)
   private readonly isTailLoading = writable(false)
 
   readonly isTailLoaded = writable(false)
+  readonly isRefsLoading = writable(false)
 
   public datesStore = writable<Timestamp[]>([])
   public newTimestampStore = writable<Timestamp | undefined>(undefined)
@@ -92,8 +94,8 @@ export class ChannelDataProvider implements IChannelDataProvider {
   public isLoadingMoreStore = writable(false)
 
   public isLoadingStore = derived(
-    [this.isInitialLoadedStore, this.isTailLoading],
-    ([initialLoaded, tailLoading]) => !initialLoaded || tailLoading
+    [this.isInitialLoadedStore, this.isTailLoading, this.isRefsLoading],
+    ([initialLoaded, tailLoading, isRefsLoading]) => !initialLoaded || tailLoading || isRefsLoading
   )
 
   private readonly backwardNextStore = writable<Chunk | undefined>(undefined)
@@ -107,8 +109,9 @@ export class ChannelDataProvider implements IChannelDataProvider {
 
   private nextChunkAdding = false
 
-  public messagesStore = derived([this.chunksStore, this.tailStore], ([chunks, tail]) => {
-    return [...chunks.map(({ data }) => data).flat(), ...tail]
+  public messagesStore = derived([this.chunksStore, this.tailStore, this.refsStore], ([chunks, tail, refs]) => {
+    const data = chunks.map(({ data, to, from }) => mergeWithRefs(data, refs, from, to))
+    return [...data.flat(), ...mergeWithRefs(tail, refs, tail[0]?.createdOn)]
   })
 
   public canLoadNextForwardStore = derived([this.messagesStore, this.forwardNextStore], ([messages, forwardNext]) => {
@@ -123,18 +126,20 @@ export class ChannelDataProvider implements IChannelDataProvider {
     chatId: Ref<Doc>,
     _class: Ref<Class<ActivityMessage>>,
     selectedMsgId: Ref<ActivityMessage> | undefined,
-    loadAll = false
+    loadAll = false,
+    withRefs = false
   ) {
     this.chatId = chatId
     this.msgClass = _class
     this.selectedMsgId = selectedMsgId
-    void this.loadData(loadAll)
+    void this.loadData(loadAll, withRefs)
   }
 
   public destroy (): void {
     this.clearData()
     this.metadataQuery.unsubscribe()
     this.tailQuery.unsubscribe()
+    this.refsQuery.unsubscribe()
   }
 
   public canLoadMore (mode: LoadMode, timestamp?: Timestamp): boolean {
@@ -168,11 +173,29 @@ export class ChannelDataProvider implements IChannelDataProvider {
     this.clearMessages()
   }
 
-  private async loadData (loadAll = false): Promise<void> {
+  loadRefs (): void {
+    // Load references from other spaces separately because they can have any different spaces
+    this.refsQuery.query(
+      activity.class.ActivityReference,
+      { attachedTo: this.chatId, space: { $ne: this.space } },
+      (res) => {
+        this.refsStore.set(res)
+        this.isRefsLoading.set(false)
+      },
+      { sort: { createdOn: SortingOrder.Ascending } }
+    )
+  }
+
+  private async loadData (loadAll = false, withRefs = false): Promise<void> {
     if (this.chatId === undefined) {
       return
     }
 
+    if (withRefs && this.msgClass === activity.class.ActivityMessage) {
+      this.isRefsLoading.set(true)
+      this.loadRefs()
+    }
+
     this.metadataQuery.query(
       this.msgClass,
       { attachedTo: this.chatId, space: this.space },
@@ -622,3 +645,21 @@ export class ChannelDataProvider implements IChannelDataProvider {
     return true
   }
 }
+
+function mergeWithRefs (
+  messages: ActivityMessage[],
+  refs: ActivityReference[],
+  from?: Timestamp,
+  to?: Timestamp
+): ActivityMessage[] {
+  if (from === undefined) return messages
+  if (refs.length === 0) return messages
+
+  const refsFiltered = refs.filter(
+    ({ createdOn }) => (createdOn ?? 0) >= from && (to === undefined || (createdOn ?? 0) <= to)
+  )
+
+  if (refsFiltered.length === 0) return messages
+
+  return sortActivityMessages(messages.concat(refsFiltered))
+}
diff --git a/plugins/chunter-resources/src/components/Channel.svelte b/plugins/chunter-resources/src/components/Channel.svelte
index 0e59ad6e95..1cdb6a9013 100644
--- a/plugins/chunter-resources/src/components/Channel.svelte
+++ b/plugins/chunter-resources/src/components/Channel.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { Class, Doc, getCurrentAccount, Ref } from '@hcengineering/core'
   import notification, { DocNotifyContext } from '@hcengineering/notification'
-  import activity, { ActivityMessage, ActivityMessagesFilter } from '@hcengineering/activity'
+  import activity, { ActivityMessage, ActivityMessagesFilter, WithReferences } from '@hcengineering/activity'
   import { getClient, isSpace } from '@hcengineering/presentation'
   import { getMessageFromLoc, messageInFocus } from '@hcengineering/activity-resources'
   import { location as locationStore } from '@hcengineering/ui'
@@ -57,6 +57,8 @@
     dataProvider = undefined
   })
 
+  let refsLoaded = false
+
   $: isDocChannel = !hierarchy.isDerived(object._class, chunter.class.ChunterSpace)
   $: _class = isDocChannel ? activity.class.ActivityMessage : chunter.class.ChatMessage
   $: collection = isDocChannel ? 'comments' : 'messages'
@@ -78,11 +80,17 @@
           attachedTo: object._id,
           user: getCurrentAccount()._id
         }))
-
+      const hasRefs = ((object as WithReferences<Doc>).references ?? 0) > 0
+      refsLoaded = hasRefs
       const space = isSpace(object) ? object._id : object.space
-      dataProvider = new ChannelDataProvider(ctx, space, attachedTo, _class, selectedMessageId, loadAll)
+      dataProvider = new ChannelDataProvider(ctx, space, attachedTo, _class, selectedMessageId, loadAll, hasRefs)
     }
   }
+
+  $: if (dataProvider && !refsLoaded && ((object as WithReferences<Doc>).references ?? 0) > 0) {
+    dataProvider.loadRefs()
+    refsLoaded = true
+  }
 </script>
 
 {#if dataProvider}
diff --git a/plugins/chunter-resources/src/components/ChannelHeader.svelte b/plugins/chunter-resources/src/components/ChannelHeader.svelte
index 61f19b514b..fde7820be1 100644
--- a/plugins/chunter-resources/src/components/ChannelHeader.svelte
+++ b/plugins/chunter-resources/src/components/ChannelHeader.svelte
@@ -17,7 +17,7 @@
   import { getDocTitle } from '@hcengineering/view-resources'
   import { getClient } from '@hcengineering/presentation'
   import { Channel } from '@hcengineering/chunter'
-  import { ActivityMessagesFilter } from '@hcengineering/activity'
+  import { ActivityMessagesFilter, WithReferences } from '@hcengineering/activity'
   import contact from '@hcengineering/contact'
 
   import Header from './Header.svelte'
@@ -27,7 +27,7 @@
 
   export let _id: Ref<Doc>
   export let _class: Ref<Class<Doc>>
-  export let object: Doc | undefined
+  export let object: WithReferences<Doc> | undefined
   export let allowClose: boolean = false
   export let canOpen: boolean = false
   export let withAside: boolean = false
@@ -78,6 +78,6 @@
   on:close
 >
   {#if object}
-    <PinnedMessages {_id} {_class} space={object.space} on:select />
+    <PinnedMessages {_id} {_class} space={object.space} withRefs={(object.references ?? 0) > 0} on:select />
   {/if}
 </Header>
diff --git a/plugins/chunter-resources/src/components/ChannelScrollView.svelte b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
index acf858887a..01897341af 100644
--- a/plugins/chunter-resources/src/components/ChannelScrollView.svelte
+++ b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
@@ -646,10 +646,7 @@
       return
     }
 
-    const lastMetadata = metadata[metadata.length - 1]
-    const lastMessage = displayMessages[displayMessages.length - 1]
-
-    if (lastMetadata._id !== lastMessage._id) {
+    if (!$isTailLoadedStore) {
       showScrollDownButton = true
     } else if (element != null) {
       const { scrollHeight, scrollTop, offsetHeight } = element
diff --git a/plugins/chunter-resources/src/components/EditChannelDescriptionAttachments.svelte b/plugins/chunter-resources/src/components/EditChannelDescriptionAttachments.svelte
index 353ce764ad..d9e9929888 100644
--- a/plugins/chunter-resources/src/components/EditChannelDescriptionAttachments.svelte
+++ b/plugins/chunter-resources/src/components/EditChannelDescriptionAttachments.svelte
@@ -17,8 +17,8 @@
   import attachment, { Attachment } from '@hcengineering/attachment'
   import { AttachmentPresenter, FileDownload } from '@hcengineering/attachment-resources'
   import { ChunterSpace } from '@hcengineering/chunter'
-  import core, { Doc, SortingOrder, getCurrentAccount, type WithLookup } from '@hcengineering/core'
-  import { createQuery, getBlobHref, getClient } from '@hcengineering/presentation'
+  import { Doc, SortingOrder, getCurrentAccount, type WithLookup } from '@hcengineering/core'
+  import { createQuery, getClient, getFileUrl } from '@hcengineering/presentation'
   import { Icon, IconMoreV, Label, Menu, getCurrentResolvedLocation, navigate, showPopup } from '@hcengineering/ui'
 
   export let channel: ChunterSpace | undefined
@@ -68,10 +68,7 @@
       {
         limit: ATTACHEMNTS_LIMIT,
         sort,
-        total: true,
-        lookup: {
-          file: core.class.Blob
-        }
+        total: true
       }
     )
 </script>
@@ -86,11 +83,9 @@
             <AttachmentPresenter value={attachment} />
           </div>
           <div class="eAttachmentRowActions" class:fixed={i === selectedRowNumber}>
-            {#await getBlobHref(attachment.$lookup?.file, attachment.file, attachment.name) then blobRef}
-              <a href={blobRef} download={attachment.name}>
-                <Icon icon={FileDownload} size={'small'} />
-              </a>
-            {/await}
+            <a href={getFileUrl(attachment.file, attachment.name)} download={attachment.name}>
+              <Icon icon={FileDownload} size={'small'} />
+            </a>
             <!-- svelte-ignore a11y-click-events-have-key-events -->
             <!-- svelte-ignore a11y-no-static-element-interactions -->
             <div id="context-menu" class="eAttachmentRowMenu" on:click={(event) => showMenu(event, attachment, i)}>
diff --git a/plugins/chunter-resources/src/components/PinnedMessages.svelte b/plugins/chunter-resources/src/components/PinnedMessages.svelte
index c529e26ee6..61b931877a 100644
--- a/plugins/chunter-resources/src/components/PinnedMessages.svelte
+++ b/plugins/chunter-resources/src/components/PinnedMessages.svelte
@@ -28,13 +28,16 @@
   export let space: Ref<Space>
   export let _class: Ref<Class<Doc>>
   export let _id: Ref<Doc>
+  export let withRefs = false
 
   const dispatch = createEventDispatcher()
   const pinnedQuery = createQuery()
   const pinnedThreadsQuery = createQuery()
+  const pinnedRefsQuery = createQuery()
 
   let pinnedMessagesCount = 0
   let pinnedThreadsCount = 0
+  let refsCount = 0
 
   $: channelSpace = getChannelSpace(_class, _id, space)
   $: pinnedQuery.query(
@@ -55,10 +58,21 @@
     { projection: { _id: 1, space: 1, objectId: 1, isPinned: 1 } }
   )
 
+  $: if (withRefs) {
+    pinnedRefsQuery.query(
+      activity.class.ActivityReference,
+      { attachedTo: _id, isPinned: true, space: { $ne: channelSpace } },
+      (res) => {
+        refsCount = res.total
+      },
+      { limit: 1, total: true }
+    )
+  }
+
   function openMessagesPopup (ev: MouseEvent): void {
     showPopup(
       PinnedMessagesPopup,
-      { attachedTo: _id, attachedToClass: _class, space: channelSpace },
+      { attachedTo: _id, attachedToClass: _class, space: channelSpace, withRefs },
       eventToHTMLElement(ev),
       (result) => {
         if (result == null) return
@@ -67,7 +81,7 @@
     )
   }
 
-  $: count = pinnedMessagesCount + pinnedThreadsCount
+  $: count = pinnedMessagesCount + pinnedThreadsCount + refsCount
 </script>
 
 {#if count > 0}
diff --git a/plugins/chunter-resources/src/components/PinnedMessagesPopup.svelte b/plugins/chunter-resources/src/components/PinnedMessagesPopup.svelte
index b49e48bbc8..e15011c96f 100644
--- a/plugins/chunter-resources/src/components/PinnedMessagesPopup.svelte
+++ b/plugins/chunter-resources/src/components/PinnedMessagesPopup.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { createQuery, getClient } from '@hcengineering/presentation'
-  import activity, { ActivityMessage } from '@hcengineering/activity'
+  import activity, { ActivityMessage, ActivityReference } from '@hcengineering/activity'
   import { ActivityMessagePresenter, sortActivityMessages } from '@hcengineering/activity-resources'
   import { ActionIcon, IconClose } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
@@ -26,14 +26,17 @@
   export let attachedTo: Ref<Doc>
   export let attachedToClass: Ref<Class<Doc>>
   export let space: Ref<Space>
+  export let withRefs = false
 
   const client = getClient()
   const dispatch = createEventDispatcher()
   const pinnedQuery = createQuery()
   const pinnedThreadsQuery = createQuery()
+  const pinnedRefsQuery = createQuery()
 
   let pinnedMessages: ActivityMessage[] = []
   let pinnedThreads: ThreadMessage[] = []
+  let pinnedRefs: ActivityReference[] = []
 
   $: pinnedQuery.query(
     activity.class.ActivityMessage,
@@ -51,6 +54,16 @@
     }
   )
 
+  $: if (withRefs) {
+    pinnedRefsQuery.query(
+      activity.class.ActivityReference,
+      { attachedTo, isPinned: true, space: { $ne: space } },
+      (res) => {
+        pinnedRefs = res
+      }
+    )
+  }
+
   $: if (pinnedMessages.length === 0 && pinnedThreads.length === 0) {
     dispatch('close', undefined)
   }
@@ -59,7 +72,10 @@
     await client.update(message, { isPinned: false })
   }
 
-  $: displayMessages = sortActivityMessages(pinnedMessages.concat(pinnedThreads), SortingOrder.Descending)
+  $: displayMessages = sortActivityMessages(
+    pinnedMessages.concat(pinnedThreads).concat(pinnedRefs),
+    SortingOrder.Descending
+  )
 </script>
 
 <div class="antiPopup vScroll popup">
diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
index d55a6a7a8c..1905c71fb6 100644
--- a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
+++ b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { Person, PersonAccount } from '@hcengineering/contact'
   import { personAccountByIdStore, personByIdStore } from '@hcengineering/contact-resources'
-  import { Class, Doc, getCurrentAccount, Ref, WithLookup } from '@hcengineering/core'
+  import { Class, Doc, getCurrentAccount, Ref, Space, WithLookup } from '@hcengineering/core'
   import { getClient, MessageViewer } from '@hcengineering/presentation'
   import { AttachmentDocList, AttachmentImageSize } from '@hcengineering/attachment-resources'
   import { getDocLinkTitle } from '@hcengineering/view-resources'
@@ -80,7 +80,7 @@
   $: person = account?.person !== undefined ? $personByIdStore.get(account.person) : undefined
 
   $: value !== undefined &&
-    getParentMessage(value.attachedToClass, value.attachedTo).then((res) => {
+    getParentMessage(value.attachedToClass, value.attachedTo, value.space).then((res) => {
       parentMessage = res as DisplayActivityMessage
     })
 
@@ -107,9 +107,13 @@
     stale = false
   }
 
-  async function getParentMessage (_class: Ref<Class<Doc>>, _id: Ref<Doc>): Promise<ActivityMessage | undefined> {
+  async function getParentMessage (
+    _class: Ref<Class<Doc>>,
+    _id: Ref<Doc>,
+    space: Ref<Space>
+  ): Promise<ActivityMessage | undefined> {
     if (hierarchy.isDerived(_class, activity.class.ActivityMessage)) {
-      return await client.findOne<ActivityMessage>(_class, { _id: _id as Ref<ActivityMessage> })
+      return await client.findOne<ActivityMessage>(_class, { _id: _id as Ref<ActivityMessage>, space })
     }
   }
 
diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessagePreview.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessagePreview.svelte
index e6cab2f4f0..dea5359773 100644
--- a/plugins/chunter-resources/src/components/chat-message/ChatMessagePreview.svelte
+++ b/plugins/chunter-resources/src/components/chat-message/ChatMessagePreview.svelte
@@ -41,11 +41,6 @@
       },
       (res) => {
         attachments = res
-      },
-      {
-        lookup: {
-          file: core.class.Blob
-        }
       }
     )
   } else {
diff --git a/plugins/chunter-resources/src/components/notification/ChatMessageNotificationLabel.svelte b/plugins/chunter-resources/src/components/notification/ChatMessageNotificationLabel.svelte
index df6ee728d8..1f870ad6ba 100644
--- a/plugins/chunter-resources/src/components/notification/ChatMessageNotificationLabel.svelte
+++ b/plugins/chunter-resources/src/components/notification/ChatMessageNotificationLabel.svelte
@@ -27,79 +27,67 @@
   import ThreadMessagePreview from '../threads/ThreadMessagePreview.svelte'
 
   export let context: DocNotifyContext
+  export let object: ChatMessage
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
 
   let title: string | undefined = undefined
-  let parentMessage: ChatMessage | undefined = undefined
-  let object: Doc | undefined = undefined
+  let channel: Doc | undefined = undefined
 
   $: isThread = hierarchy.isDerived(context.attachedToClass, chunter.class.ThreadMessage)
 
-  $: void client
-    .findOne(context.attachedToClass as Ref<Class<ChatMessage>>, { _id: context.attachedTo as Ref<ChatMessage> })
-    .then((res) => {
-      parentMessage = res
-    })
-
-  $: loadObject(parentMessage, isThread)
-  $: object &&
-    getDocLinkTitle(client, object._id, object._class, object).then((res) => {
+  $: loadChannel(object, isThread)
+  $: channel &&
+    getDocLinkTitle(client, channel._id, channel._class, channel).then((res) => {
       title = res
     })
 
-  function loadObject (parentMessage: ChatMessage | undefined, isThread: boolean): void {
-    if (parentMessage === undefined) {
-      object = undefined
-      return
-    }
-
-    const _class = isThread ? (parentMessage as ThreadMessage).objectClass : parentMessage.attachedToClass
-    const _id = isThread ? (parentMessage as ThreadMessage).objectId : parentMessage.attachedTo
-
-    void client.findOne(_class, { _id }).then((res) => {
-      object = res
+  function loadChannel (object: ChatMessage, isThread: boolean): void {
+    const _class = isThread ? (object as ThreadMessage).objectClass : object.attachedToClass
+    const _id = isThread ? (object as ThreadMessage).objectId : object.attachedTo
+    console.log({ _class, _id, isThread, object })
+    void client.findOne(_class, { _id, ...(isThread ? { space: object.space } : {}) }).then((res) => {
+      channel = res
     })
   }
 
   function toThread (message: ChatMessage): ThreadMessage {
     return message as ThreadMessage
   }
+
+  function isAvatarIcon (_class: Ref<Class<Doc>>): boolean {
+    return hierarchy.isDerived(_class, contact.class.Person) || hierarchy.isDerived(_class, chunter.class.DirectMessage)
+  }
 </script>
 
-{#if parentMessage}
-  <span class="flex-presenter flex-gap-1 font-semi-bold">
-    {#if isThread || (parentMessage.replies ?? 0) > 0}
-      <Label label={chunter.string.Thread} />
-    {:else}
-      <Label label={chunter.string.Message} />
-    {/if}
-    {#if title && object}
-      <span class="lower">
-        <Label label={chunter.string.In} />
-      </span>
-      {#await getDocTitle(client, object._id, object._class, object) then tooltipLabel}
-        <span
-          class="flex-presenter flex-gap-0-5"
-          use:tooltip={tooltipLabel ? { label: getEmbeddedLabel(tooltipLabel) } : undefined}
-        >
-          <ObjectIcon
-            value={object}
-            size={hierarchy.isDerived(object._class, contact.class.Person) ? 'tiny' : 'small'}
-          />
-          <span class="overflow-label">
-            {title}
-          </span>
+<span class="flex-presenter flex-gap-1 font-semi-bold">
+  {#if isThread || (object.replies ?? 0) > 0}
+    <Label label={chunter.string.Thread} />
+  {:else}
+    <Label label={chunter.string.Message} />
+  {/if}
+  {#if title && channel}
+    <span class="lower">
+      <Label label={chunter.string.In} />
+    </span>
+    {#await getDocTitle(client, channel._id, channel._class, channel) then tooltipLabel}
+      <span
+        class="flex-presenter flex-gap-0-5"
+        use:tooltip={tooltipLabel ? { label: getEmbeddedLabel(tooltipLabel) } : undefined}
+      >
+        <ObjectIcon value={channel} size={isAvatarIcon(channel._class) ? 'tiny' : 'small'} />
+        <span class="overflow-label">
+          {title}
         </span>
-      {/await}
-    {/if}
-  </span>
-  <span class="font-normal">
-    {#if isThread}
-      <ThreadMessagePreview value={toThread(parentMessage)} readonly type="content-only" />
-    {:else}
-      <ChatMessagePreview value={parentMessage} readonly type="content-only" />
-    {/if}
-  </span>
-{/if}
+      </span>
+    {/await}
+  {/if}
+</span>
+<span class="font-normal">
+  {#if isThread}
+    <ThreadMessagePreview value={toThread(object)} readonly type="content-only" />
+  {:else}
+    <ChatMessagePreview value={object} readonly type="content-only" />
+  {/if}
+</span>
diff --git a/plugins/contact-resources/src/components/AvatarRef.svelte b/plugins/contact-resources/src/components/AvatarRef.svelte
index d35871d99c..4cd137124e 100644
--- a/plugins/contact-resources/src/components/AvatarRef.svelte
+++ b/plugins/contact-resources/src/components/AvatarRef.svelte
@@ -38,7 +38,7 @@
 
   $: if (empValue === undefined) {
     void getClient()
-      .findOne(contact.class.Contact, { _id }, { lookup: { avatar: core.class.Blob } })
+      .findOne(contact.class.Contact, { _id })
       .then((c) => {
         _contact = c
       })
diff --git a/plugins/contact-resources/src/index.ts b/plugins/contact-resources/src/index.ts
index cf1c39e67d..cbbe385e37 100644
--- a/plugins/contact-resources/src/index.ts
+++ b/plugins/contact-resources/src/index.ts
@@ -15,11 +15,11 @@
 //
 
 import {
-  type Channel,
-  type AvatarInfo,
-  type Contact,
   getGravatarUrl,
   getName,
+  type AvatarInfo,
+  type Channel,
+  type Contact,
   type Person,
   type PersonAccount
 } from '@hcengineering/contact'
@@ -49,6 +49,7 @@ import {
   type ColorDefinition,
   type TooltipAlignment
 } from '@hcengineering/ui'
+import { AggregationManager } from '@hcengineering/view-resources'
 import AccountArrayEditor from './components/AccountArrayEditor.svelte'
 import AccountBox from './components/AccountBox.svelte'
 import AssigneeBox from './components/AssigneeBox.svelte'
@@ -122,7 +123,6 @@ import NameChangedActivityMessage from './components/activity/NameChangedActivit
 import IconAddMember from './components/icons/AddMember.svelte'
 import ExpandRightDouble from './components/icons/ExpandRightDouble.svelte'
 import IconMembers from './components/icons/Members.svelte'
-import { AggregationManager } from '@hcengineering/view-resources'
 
 import { get, writable } from 'svelte/store'
 import contact from './plugin'
@@ -408,7 +408,7 @@ export default async (): Promise<Resources> => ({
           color: getPersonColor(person, name)
         }
       }
-      const blobRef = await getBlobRef(person.$lookup?.avatar, person.avatar, undefined, width)
+      const blobRef = await getBlobRef(person.avatar, undefined, width)
       return {
         url: blobRef.src,
         srcSet: blobRef.srcset,
diff --git a/plugins/contact-resources/src/utils.ts b/plugins/contact-resources/src/utils.ts
index d4b4a280fe..50ebebca15 100644
--- a/plugins/contact-resources/src/utils.ts
+++ b/plugins/contact-resources/src/utils.ts
@@ -320,19 +320,10 @@ function fillStores (): void {
     const accountPersonQuery = createQuery(true)
 
     const query = createQuery(true)
-    query.query(
-      contact.mixin.Employee,
-      {},
-      (res) => {
-        employeesStore.set(res)
-        employeeByIdStore.set(toIdMap(res))
-      },
-      {
-        lookup: {
-          avatar: core.class.Blob
-        }
-      }
-    )
+    query.query(contact.mixin.Employee, {}, (res) => {
+      employeesStore.set(res)
+      employeeByIdStore.set(toIdMap(res))
+    })
 
     const accountQ = createQuery(true)
     accountQ.query(contact.class.PersonAccount, {}, (res) => {
@@ -345,11 +336,6 @@ function fillStores (): void {
         { _id: { $in: persons }, [contact.mixin.Employee]: { $exists: false } },
         (res) => {
           personAccountPersonByIdStore.set(toIdMap(res))
-        },
-        {
-          lookup: {
-            avatar: core.class.Blob
-          }
         }
       )
     })
diff --git a/plugins/drive-resources/src/components/EditFile.svelte b/plugins/drive-resources/src/components/EditFile.svelte
index a2351cbcc5..0427e54b17 100644
--- a/plugins/drive-resources/src/components/EditFile.svelte
+++ b/plugins/drive-resources/src/components/EditFile.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import core, { type Blob, type WithLookup } from '@hcengineering/core'
+  import { type Blob, type Ref, type WithLookup } from '@hcengineering/core'
   import drive, { type File, type FileVersion } from '@hcengineering/drive'
   import { FilePreview, createQuery } from '@hcengineering/presentation'
 
@@ -26,32 +26,23 @@
   const dispatch = createEventDispatcher()
   const query = createQuery()
 
-  let blob: Blob | undefined = undefined
+  let blob: Ref<Blob> | undefined = undefined
   let version: WithLookup<FileVersion> | undefined = undefined
+  let contentType: string | undefined
 
-  $: query.query(
-    drive.class.FileVersion,
-    { _id: object.file },
-    (res) => {
-      ;[version] = res
-      blob = version?.$lookup?.file
-    },
-    {
-      lookup: {
-        file: core.class.Blob
-      }
-    }
-  )
+  $: query.query(drive.class.FileVersion, { _id: object.file }, (res) => {
+    ;[version] = res
+    blob = version.file
+    contentType = version.type
+  })
 
   onMount(() => {
     dispatch('open', { ignoreKeys: ['parent', 'path', 'version', 'versions'] })
   })
 </script>
 
-{#if object !== undefined && version !== undefined}
-  {#if blob !== undefined}
-    <FilePreview file={blob} name={version.name} metadata={version.metadata} fit />
-  {/if}
+{#if object !== undefined && version !== undefined && blob !== undefined && contentType !== undefined}
+  <FilePreview file={blob} {contentType} name={version.name} metadata={version.metadata} fit />
 
   {#if object.versions > 1}
     <div class="w-full mt-6">
diff --git a/plugins/drive-resources/src/components/EditFileVersions.svelte b/plugins/drive-resources/src/components/EditFileVersions.svelte
index 4f4e9a85aa..b3af909528 100644
--- a/plugins/drive-resources/src/components/EditFileVersions.svelte
+++ b/plugins/drive-resources/src/components/EditFileVersions.svelte
@@ -24,7 +24,6 @@
   export let readonly: boolean = false
 
   const options: FindOptions<FileVersion> = {
-    lookup: { file: core.class.Blob },
     sort: { version: SortingOrder.Descending }
   }
 </script>
diff --git a/plugins/drive-resources/src/components/FileAside.svelte b/plugins/drive-resources/src/components/FileAside.svelte
index 711064899d..4f1bc2b359 100644
--- a/plugins/drive-resources/src/components/FileAside.svelte
+++ b/plugins/drive-resources/src/components/FileAside.svelte
@@ -24,9 +24,5 @@
 
 <Scroller>
   <DocAttributeBar {object} {readonly} ignoreKeys={[]} />
-
-  {#if object.$lookup?.file}
-    <DocAttributeBar object={object.$lookup.file} {readonly} ignoreKeys={['name', 'file', 'version', 'version']} />
-  {/if}
   <div class="space-divider bottom" />
 </Scroller>
diff --git a/plugins/drive-resources/src/components/FilePanel.svelte b/plugins/drive-resources/src/components/FilePanel.svelte
index bbbd74b924..d9c8cdac56 100644
--- a/plugins/drive-resources/src/components/FilePanel.svelte
+++ b/plugins/drive-resources/src/components/FilePanel.svelte
@@ -16,7 +16,7 @@
   import { type Ref, type WithLookup } from '@hcengineering/core'
   import { createFileVersion, type File as DriveFile, type FileVersion } from '@hcengineering/drive'
   import { Panel } from '@hcengineering/panel'
-  import { createQuery, getBlobHref, getClient } from '@hcengineering/presentation'
+  import { createQuery, getClient, getFileUrl } from '@hcengineering/presentation'
   import { Button, IconMoreH } from '@hcengineering/ui'
   import { showFilesUploadPopup } from '@hcengineering/uploader'
   import view from '@hcengineering/view'
@@ -108,17 +108,15 @@
     </svelte:fragment>
 
     <svelte:fragment slot="utils">
-      {#await getBlobHref(undefined, version.file, object.name) then href}
-        <a class="no-line" {href} download={object.name} bind:this={download}>
-          <Button
-            icon={IconDownload}
-            iconProps={{ size: 'medium' }}
-            kind={'icon'}
-            showTooltip={{ label: drive.string.Download }}
-            on:click={handleDownloadFile}
-          />
-        </a>
-      {/await}
+      <a class="no-line" href={getFileUrl(version.file, object.name)} download={object.name} bind:this={download}>
+        <Button
+          icon={IconDownload}
+          iconProps={{ size: 'medium' }}
+          kind={'icon'}
+          showTooltip={{ label: drive.string.Download }}
+          on:click={handleDownloadFile}
+        />
+      </a>
       <Button
         icon={IconUpload}
         iconProps={{ size: 'medium' }}
diff --git a/plugins/drive-resources/src/components/FileVersionPresenter.svelte b/plugins/drive-resources/src/components/FileVersionPresenter.svelte
index 9679874961..d7330dbebf 100644
--- a/plugins/drive-resources/src/components/FileVersionPresenter.svelte
+++ b/plugins/drive-resources/src/components/FileVersionPresenter.svelte
@@ -38,17 +38,11 @@
       return
     }
 
-    if (value.$lookup?.file === undefined) {
-      return
-    }
-
-    const blob = value.$lookup?.file
-
     showPopup(
       FilePreviewPopup,
       {
-        file: blob._id,
-        contentType: blob.contentType,
+        file: value.file,
+        contentType: value.type,
         name: value.name,
         metadata: value.metadata
       },
diff --git a/plugins/drive-resources/src/components/Thumbnail.svelte b/plugins/drive-resources/src/components/Thumbnail.svelte
index 8fa57a2b4b..ffe1771840 100644
--- a/plugins/drive-resources/src/components/Thumbnail.svelte
+++ b/plugins/drive-resources/src/components/Thumbnail.svelte
@@ -44,7 +44,7 @@
 {#if isFolder}
   <Icon icon={IconFolderThumbnail} size={'full'} fill={'var(--global-no-priority-PriorityColor)'} />
 {:else if previewRef != null && isImage && !isError}
-  {#await getBlobRef(undefined, previewRef, object.name, sizeToWidth(size)) then blobSrc}
+  {#await getBlobRef(previewRef, object.name, sizeToWidth(size)) then blobSrc}
     <img
       draggable="false"
       class="img-fit"
diff --git a/plugins/drive-resources/src/index.ts b/plugins/drive-resources/src/index.ts
index 7ba89894da..9a13923579 100644
--- a/plugins/drive-resources/src/index.ts
+++ b/plugins/drive-resources/src/index.ts
@@ -16,7 +16,6 @@
 import { type Doc, type Ref, type WithLookup } from '@hcengineering/core'
 import drive, { type Drive, type File, type FileVersion, type Folder } from '@hcengineering/drive'
 import { type Resources } from '@hcengineering/platform'
-import { getBlobHref } from '@hcengineering/presentation'
 import { showPopup, type Location } from '@hcengineering/ui'
 
 import CreateDrive from './components/CreateDrive.svelte'
@@ -37,8 +36,9 @@ import GridView from './components/GridView.svelte'
 import MoveResource from './components/MoveResource.svelte'
 import ResourcePresenter from './components/ResourcePresenter.svelte'
 
+import { getFileUrl } from '@hcengineering/presentation'
 import { getDriveLink, getFileLink, getFolderLink, resolveLocation } from './navigation'
-import { showCreateFolderPopup, showRenameResourcePopup, restoreFileVersion } from './utils'
+import { restoreFileVersion, showCreateFolderPopup, showRenameResourcePopup } from './utils'
 
 async function CreateRootFolder (doc: Drive): Promise<void> {
   await showCreateFolderPopup(doc._id, drive.ids.Root)
@@ -57,7 +57,7 @@ async function DownloadFile (doc: WithLookup<File> | Array<WithLookup<File>>): P
   for (const file of files) {
     const version = file.$lookup?.file
     if (version != null) {
-      const href = await getBlobHref(undefined, version.file, version.name)
+      const href = getFileUrl(version.file, version.name)
       const link = document.createElement('a')
       link.style.display = 'none'
       link.target = '_blank'
diff --git a/plugins/gmail-resources/src/components/FullMessage.svelte b/plugins/gmail-resources/src/components/FullMessage.svelte
index 57407e2081..8990019235 100644
--- a/plugins/gmail-resources/src/components/FullMessage.svelte
+++ b/plugins/gmail-resources/src/components/FullMessage.svelte
@@ -52,11 +52,6 @@
       },
       (res) => {
         attachments = res
-      },
-      {
-        lookup: {
-          file: core.class.Blob
-        }
       }
     )
 
diff --git a/plugins/gmail-resources/src/components/FullMessagePopup.svelte b/plugins/gmail-resources/src/components/FullMessagePopup.svelte
index a125a0af66..c695a0a3a9 100644
--- a/plugins/gmail-resources/src/components/FullMessagePopup.svelte
+++ b/plugins/gmail-resources/src/components/FullMessagePopup.svelte
@@ -36,11 +36,6 @@
       },
       (res) => {
         attachments = res
-      },
-      {
-        lookup: {
-          file: core.class.Blob
-        }
       }
     )
 
diff --git a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte b/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
index b345dd66c7..de71c3532f 100644
--- a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
+++ b/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
@@ -20,10 +20,10 @@
     DocNotifyContext,
     InboxNotification
   } from '@hcengineering/notification'
-  import { getClient } from '@hcengineering/presentation'
+  import { createQuery, getClient, isSpace, isSpaceClass } from '@hcengineering/presentation'
   import { getDocTitle, getDocIdentifier, Menu } from '@hcengineering/view-resources'
   import { createEventDispatcher } from 'svelte'
-  import { Class, Doc, IdMap, Ref, WithLookup } from '@hcengineering/core'
+  import core, { Class, Doc, IdMap, Ref, WithLookup } from '@hcengineering/core'
   import chunter from '@hcengineering/chunter'
   import { personAccountByIdStore } from '@hcengineering/contact-resources'
   import { Person, PersonAccount } from '@hcengineering/contact'
@@ -47,6 +47,22 @@
   const client = getClient()
   const hierarchy = client.getHierarchy()
   const dispatch = createEventDispatcher()
+  const query = createQuery()
+
+  let object: Doc | undefined = undefined
+
+  $: query.query(
+    value.attachedToClass,
+    { _id: value.attachedTo, space: isSpaceClass(value.attachedToClass) ? core.space.Space : value.space },
+    (res) => {
+      object = res[0]
+    },
+    { limit: 1 }
+  )
+
+  $: if (object?._id !== value.attachedTo) {
+    object = undefined
+  }
 
   let isActionMenuOpened = false
   let unreadCount = 0
@@ -56,13 +72,15 @@
   let idTitle: string | undefined
   let title: string | undefined
 
-  $: void getDocIdentifier(client, value.attachedTo, value.attachedToClass).then((res) => {
-    idTitle = res
-  })
+  $: object &&
+    getDocIdentifier(client, object._id, object._class, object).then((res) => {
+      idTitle = res
+    })
 
-  $: void getDocTitle(client, value.attachedTo, value.attachedToClass).then((res) => {
-    title = res
-  })
+  $: object &&
+    getDocTitle(client, object._id, object._class, object).then((res) => {
+      title = res
+    })
 
   $: presenterMixin = hierarchy.classHierarchyMixin(
     value.attachedToClass,
@@ -184,73 +202,75 @@
     dispatch('click', { context: value })
   }}
 >
-  <div class="header">
-    <NotifyContextIcon {value} notifyCount={unreadCount} />
+  {#if object}
+    <div class="header">
+      <NotifyContextIcon {value} notifyCount={unreadCount} {object} />
 
-    <div class="labels">
-      {#if presenterMixin?.labelPresenter}
-        <Component is={presenterMixin.labelPresenter} props={{ context: value }} />
-      {:else}
-        {#if idTitle}
-          {idTitle}
+      <div class="labels">
+        {#if presenterMixin?.labelPresenter}
+          <Component is={presenterMixin.labelPresenter} props={{ context: value, object }} />
         {:else}
-          <Label label={hierarchy.getClass(value.attachedToClass).label} />
-        {/if}
-        <span class="title overflow-label clear-mins" {title}>
-          {#if title}
-            {title}
+          {#if idTitle}
+            {idTitle}
           {:else}
             <Label label={hierarchy.getClass(value.attachedToClass).label} />
           {/if}
-        </span>
-      {/if}
-    </div>
-
-    <div class="actions clear-mins">
-      <div class="flex-center">
-        {#if archivingPromise !== undefined}
-          <Spinner size="small" />
-        {:else}
-          <CheckBox checked={archived} kind="todo" size="medium" on:value={checkContext} />
+          <span class="title overflow-label clear-mins" {title}>
+            {#if title}
+              {title}
+            {:else}
+              <Label label={hierarchy.getClass(value.attachedToClass).label} />
+            {/if}
+          </span>
         {/if}
       </div>
-      <ButtonIcon
-        icon={IconMoreV}
-        size="small"
-        kind="tertiary"
-        inheritColor
-        pressed={isActionMenuOpened}
-        on:click={showMenu}
-      />
-    </div>
-  </div>
 
-  <div class="content">
-    <div class="notifications">
-      {#each groupedNotifications.slice(0, maxNotifications) as group (getKey(group))}
-        <div class="notification">
-          <!--          use:tooltip={canShowTooltip(group)-->
-          <!--            ? {-->
-          <!--                component: MessagesPopup,-->
-          <!--                props: { context: value, notifications: group }-->
-          <!--              }-->
-          <!--            : undefined}-->
-
-          <div class="embeddedMarker" />
-          <InboxNotificationPresenter
-            value={group[0]}
-            {viewlets}
-            space={value.space}
-            on:click={(e) => {
-              e.preventDefault()
-              e.stopPropagation()
-              dispatch('click', { context: value, notification: group[0] })
-            }}
-          />
+      <div class="actions clear-mins">
+        <div class="flex-center">
+          {#if archivingPromise !== undefined}
+            <Spinner size="small" />
+          {:else}
+            <CheckBox checked={archived} kind="todo" size="medium" on:value={checkContext} />
+          {/if}
         </div>
-      {/each}
+        <ButtonIcon
+          icon={IconMoreV}
+          size="small"
+          kind="tertiary"
+          inheritColor
+          pressed={isActionMenuOpened}
+          on:click={showMenu}
+        />
+      </div>
     </div>
-  </div>
+    <div class="content">
+      <div class="notifications">
+        {#each groupedNotifications.slice(0, maxNotifications) as group (getKey(group))}
+          <div class="notification">
+            <!--          use:tooltip={canShowTooltip(group)-->
+            <!--            ? {-->
+            <!--                component: MessagesPopup,-->
+            <!--                props: { context: value, notifications: group }-->
+            <!--              }-->
+            <!--            : undefined}-->
+
+            <div class="embeddedMarker" />
+            <InboxNotificationPresenter
+              value={group[0]}
+              {object}
+              {viewlets}
+              space={value.space}
+              on:click={(e) => {
+                e.preventDefault()
+                e.stopPropagation()
+                dispatch('click', { context: value, notification: group[0] })
+              }}
+            />
+          </div>
+        {/each}
+      </div>
+    </div>
+  {/if}
 </div>
 
 <style lang="scss">
@@ -261,6 +281,7 @@
     cursor: pointer;
     padding: var(--spacing-1_5) var(--spacing-1);
     border-bottom: 1px solid var(--global-ui-BorderColor);
+    min-height: 5.625rem;
 
     .header {
       position: relative;
diff --git a/plugins/notification-resources/src/components/DocNotifyContextPresenter.svelte b/plugins/notification-resources/src/components/DocNotifyContextPresenter.svelte
index bfc5d38d9c..2bd06ef3ee 100644
--- a/plugins/notification-resources/src/components/DocNotifyContextPresenter.svelte
+++ b/plugins/notification-resources/src/components/DocNotifyContextPresenter.svelte
@@ -14,9 +14,9 @@
 -->
 <script lang="ts">
   import { DocNotifyContext } from '@hcengineering/notification'
-  import { Doc } from '@hcengineering/core'
+  import core, { Doc } from '@hcengineering/core'
   import { getDocLinkTitle, getDocTitle } from '@hcengineering/view-resources'
-  import { createQuery, getClient } from '@hcengineering/presentation'
+  import { createQuery, getClient, isSpaceClass } from '@hcengineering/presentation'
   import chunter from '@hcengineering/chunter'
   import NotifyContextIcon from './NotifyContextIcon.svelte'
 
@@ -27,9 +27,13 @@
 
   let object: Doc | undefined
 
-  $: objectQuery.query(value.attachedToClass, { _id: value.attachedTo }, (res) => {
-    object = res[0]
-  })
+  $: objectQuery.query(
+    value.attachedToClass,
+    { _id: value.attachedTo, space: isSpaceClass(value.attachedToClass) ? core.space.Space : value.space },
+    (res) => {
+      object = res[0]
+    }
+  )
 
   async function getTitle (object: Doc) {
     if (object._class === chunter.class.DirectMessage) {
@@ -41,7 +45,7 @@
 
 {#if object}
   <div class="flex-presenter">
-    <NotifyContextIcon {value} size="small" />
+    <NotifyContextIcon {value} {object} size="small" />
     <div class="mr-4" />
 
     {#await getTitle(object) then title}
diff --git a/plugins/notification-resources/src/components/NotifyContextIcon.svelte b/plugins/notification-resources/src/components/NotifyContextIcon.svelte
index 3287fe7d12..6d5876ade1 100644
--- a/plugins/notification-resources/src/components/NotifyContextIcon.svelte
+++ b/plugins/notification-resources/src/components/NotifyContextIcon.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import notification, { DocNotifyContext } from '@hcengineering/notification'
   import { Component, Icon, IconSize } from '@hcengineering/ui'
-  import { createQuery, getClient } from '@hcengineering/presentation'
+  import { getClient } from '@hcengineering/presentation'
   import { classIcon } from '@hcengineering/view-resources'
   import view from '@hcengineering/view'
   import { Doc } from '@hcengineering/core'
@@ -25,21 +25,12 @@
   export let value: DocNotifyContext
   export let size: IconSize = 'medium'
   export let notifyCount: number = 0
+  export let object: Doc | undefined
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
-  const query = createQuery()
 
-  let object: Doc | undefined = undefined
-
-  $: if (object?._id !== value.attachedTo) {
-    object = undefined
-  }
   $: iconMixin = hierarchy.classHierarchyMixin(value.attachedToClass, view.mixin.ObjectIcon)
-  $: iconMixin &&
-    query.query(value.attachedToClass, { _id: value.attachedTo }, (res) => {
-      object = res[0]
-    })
 </script>
 
 <div class="container">
diff --git a/plugins/notification-resources/src/components/ReactionNotificationPresenter.svelte b/plugins/notification-resources/src/components/ReactionNotificationPresenter.svelte
index 0783f61a90..b36762290e 100644
--- a/plugins/notification-resources/src/components/ReactionNotificationPresenter.svelte
+++ b/plugins/notification-resources/src/components/ReactionNotificationPresenter.svelte
@@ -26,6 +26,7 @@
 
   $: void client
     .findAll(activity.class.Reaction, {
+      space: message.space,
       _id: { $in: [message.objectId, ...(message?.previousMessages?.map((a) => a.objectId) ?? [])] as Ref<Reaction>[] }
     })
     .then((res) => {
diff --git a/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte b/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte
index 1bd6647f56..836dc267dc 100644
--- a/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte
+++ b/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { getClient } from '@hcengineering/presentation'
-  import { Ref, Space, matchQuery } from '@hcengineering/core'
+  import { Ref, Space, matchQuery, Doc } from '@hcengineering/core'
   import notification, {
     ActivityInboxNotification,
     ActivityNotificationViewlet,
@@ -30,6 +30,7 @@
   import { getActions } from '@hcengineering/view-resources'
   import { getResource } from '@hcengineering/platform'
 
+  export let object: Doc | undefined
   export let value: DisplayActivityInboxNotification
   export let viewlets: ActivityNotificationViewlet[] = []
   export let space: Ref<Space> | undefined = undefined
@@ -100,6 +101,6 @@
       on:click
     />
   {:else}
-    <ActivityMessagePreview value={displayMessage} {actions} {space} on:click />
+    <ActivityMessagePreview value={displayMessage} {actions} {space} doc={object} on:click />
   {/if}
 {/if}
diff --git a/plugins/notification-resources/src/components/inbox/InboxNotificationPresenter.svelte b/plugins/notification-resources/src/components/inbox/InboxNotificationPresenter.svelte
index e1859ae0ff..3f485ae988 100644
--- a/plugins/notification-resources/src/components/inbox/InboxNotificationPresenter.svelte
+++ b/plugins/notification-resources/src/components/inbox/InboxNotificationPresenter.svelte
@@ -20,6 +20,7 @@
   import { ActivityNotificationViewlet, DisplayInboxNotification } from '@hcengineering/notification'
 
   export let value: DisplayInboxNotification
+  export let object: Doc | undefined
   export let viewlets: ActivityNotificationViewlet[] = []
   export let space: Ref<Space> | undefined = undefined
 
@@ -30,5 +31,5 @@
 </script>
 
 {#if objectPresenter}
-  <Component is={objectPresenter.presenter} props={{ value, viewlets, space }} on:click />
+  <Component is={objectPresenter.presenter} props={{ value, viewlets, space, object }} on:click />
 {/if}
diff --git a/plugins/notification-resources/src/utils.ts b/plugins/notification-resources/src/utils.ts
index a988155575..5b6a75f15b 100644
--- a/plugins/notification-resources/src/utils.ts
+++ b/plugins/notification-resources/src/utils.ts
@@ -76,9 +76,13 @@ const providerSettingsQuery = createQuery(true)
 const typeSettingsQuery = createQuery(true)
 
 export function loadNotificationSettings (): void {
-  providerSettingsQuery.query(notification.class.NotificationProviderSetting, {}, (res) => {
-    providersSettings.set(res)
-  })
+  providerSettingsQuery.query(
+    notification.class.NotificationProviderSetting,
+    { space: core.space.Workspace },
+    (res) => {
+      providersSettings.set(res)
+    }
+  )
   typeSettingsQuery.query(notification.class.NotificationTypeSetting, {}, (res) => {
     typesSettings.set(res)
   })
diff --git a/plugins/products-resources/src/components/product-version/ProductVersionsPopup.svelte b/plugins/products-resources/src/components/product-version/ProductVersionsPopup.svelte
index a9d0d558d2..55e25a7df9 100644
--- a/plugins/products-resources/src/components/product-version/ProductVersionsPopup.svelte
+++ b/plugins/products-resources/src/components/product-version/ProductVersionsPopup.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import type { Product, ProductVersion } from '@hcengineering/products'
-  import { FindOptions, SortingOrder } from '@hcengineering/core'
+  import core, { FindOptions, SortingOrder } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
   import { Label, Loading } from '@hcengineering/ui'
   import view, { Viewlet, ViewletPreference } from '@hcengineering/view'
@@ -45,6 +45,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: viewlet._id
       },
       (res) => {
diff --git a/plugins/recruit-resources/src/components/CreateApplication.svelte b/plugins/recruit-resources/src/components/CreateApplication.svelte
index 8df866ad83..8cd5bcb325 100644
--- a/plugins/recruit-resources/src/components/CreateApplication.svelte
+++ b/plugins/recruit-resources/src/components/CreateApplication.svelte
@@ -20,6 +20,7 @@
   import { EmployeeBox, ExpandRightDouble, UserBox } from '@hcengineering/contact-resources'
   import {
     Account,
+    AccountRole,
     Class,
     Client,
     Doc,
@@ -28,10 +29,9 @@
     Ref,
     SortingOrder,
     Space,
+    Status as TaskStatus,
     fillDefaults,
     generateId,
-    Status as TaskStatus,
-    AccountRole,
     getCurrentAccount,
     hasAccountRole
   } from '@hcengineering/core'
@@ -43,10 +43,10 @@
     createQuery,
     getClient
   } from '@hcengineering/presentation'
-  import type { Applicant, Candidate, Vacancy } from '@hcengineering/recruit'
+  import { recruitId, type Applicant, type Candidate, type Vacancy } from '@hcengineering/recruit'
   import task, { TaskType, getStates, makeRank } from '@hcengineering/task'
   import { TaskKindSelector, selectedTypeStore, typeStore } from '@hcengineering/task-resources'
-  import { EmptyMarkup } from '@hcengineering/text'
+  import { EmptyMarkup, isEmptyMarkup } from '@hcengineering/text'
   import ui, {
     Button,
     ColorPopup,
@@ -132,8 +132,11 @@
     if (candidateInstance === undefined) {
       throw new Error('contact not found')
     }
+
+    const ops = client.apply(generateId(), recruitId + '.Create.CreateApplication')
+
     if (!client.getHierarchy().hasMixin(candidateInstance, recruit.mixin.Candidate)) {
-      await client.createMixin<Contact, Candidate>(
+      await ops.createMixin<Contact, Candidate>(
         candidateInstance._id,
         candidateInstance._class,
         candidateInstance.space,
@@ -144,7 +147,7 @@
 
     const number = (incResult as any).object.sequence
 
-    await client.addCollection(
+    await ops.addCollection(
       recruit.class.Applicant,
       _space,
       candidateInstance._id,
@@ -166,11 +169,12 @@
 
     await descriptionBox.createAttachments()
 
-    if (_comment.trim().length > 0) {
-      await client.addCollection(chunter.class.ChatMessage, _space, doc._id, recruit.class.Applicant, 'comments', {
+    if (_comment.trim().length > 0 && !isEmptyMarkup(_comment)) {
+      await ops.addCollection(chunter.class.ChatMessage, _space, doc._id, recruit.class.Applicant, 'comments', {
         message: _comment
       })
     }
+    await ops.commit()
   }
 
   async function invokeValidate (
diff --git a/plugins/recruit-resources/src/components/CreateCandidate.svelte b/plugins/recruit-resources/src/components/CreateCandidate.svelte
index 54c091ddce..4ca600aed6 100644
--- a/plugins/recruit-resources/src/components/CreateCandidate.svelte
+++ b/plugins/recruit-resources/src/components/CreateCandidate.svelte
@@ -366,7 +366,7 @@
       const formattedSkills = (doc.skills.map((s) => s.toLowerCase()) ?? []).filter(
         (skill) => !namedElements.has(skill)
       )
-      const refactoredSkills = []
+      const refactoredSkills: any[] = []
       if (formattedSkills.length > 0) {
         const existingTags = Array.from(namedElements.keys()).filter((x) => x.length > 2)
         const regex = /\S+(?:[-+]\S+)+/g
@@ -755,6 +755,7 @@
                 FilePreviewPopup,
                 {
                   file: object.resumeUuid,
+                  contentType: object.resumeType,
                   name: object.resumeName
                 },
                 object.resumeType?.startsWith('image/') ? 'centered' : 'float'
diff --git a/plugins/recruit-resources/src/components/VacancyApplicationsPopup.svelte b/plugins/recruit-resources/src/components/VacancyApplicationsPopup.svelte
index 937244b331..ce089831df 100644
--- a/plugins/recruit-resources/src/components/VacancyApplicationsPopup.svelte
+++ b/plugins/recruit-resources/src/components/VacancyApplicationsPopup.svelte
@@ -51,6 +51,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: viewlet._id
       },
       (res) => {
diff --git a/plugins/support-assets/lang/en.json b/plugins/support-assets/lang/en.json
index ac74ca6487..9a5936eecf 100644
--- a/plugins/support-assets/lang/en.json
+++ b/plugins/support-assets/lang/en.json
@@ -1,6 +1,7 @@
 {
   "string": {
     "ContactUs": "Contact us",
-    "ReportBug": "Report a Bug?"
+    "ReportBug": "Report a Bug?",
+    "PrivacyPolicy": "Privacy Policy"
   }
 }
diff --git a/plugins/support-assets/lang/es.json b/plugins/support-assets/lang/es.json
index 613753d14d..53f773ded2 100644
--- a/plugins/support-assets/lang/es.json
+++ b/plugins/support-assets/lang/es.json
@@ -1,6 +1,7 @@
 {
   "string": {
     "ContactUs": "Contacta con Nosotros",
-    "ReportBug": "Reportar un error?"
+    "ReportBug": "Reportar un error?",
+    "PrivacyPolicy": "Política de Privacidad"
   }
 }
diff --git a/plugins/support-assets/lang/fr.json b/plugins/support-assets/lang/fr.json
index c0502a1442..d752300255 100644
--- a/plugins/support-assets/lang/fr.json
+++ b/plugins/support-assets/lang/fr.json
@@ -1,6 +1,7 @@
 {
   "string": {
     "ContactUs": "Contactez nous",
-    "ReportBug": "Rapporter un bug?"
+    "ReportBug": "Rapporter un bug?",
+    "PrivacyPolicy": "Politique de Confidentialité"
   }
 }
\ No newline at end of file
diff --git a/plugins/support-assets/lang/pt.json b/plugins/support-assets/lang/pt.json
index 836e9715e4..50fc0b38ae 100644
--- a/plugins/support-assets/lang/pt.json
+++ b/plugins/support-assets/lang/pt.json
@@ -1,6 +1,7 @@
 {
   "string": {
     "ContactUs": "Contate-nos",
-    "ReportBug": "Reportar um erro?"
+    "ReportBug": "Reportar um erro?",
+    "PrivacyPolicy": "Política de Privacidade"
   }
 }
diff --git a/plugins/support-assets/lang/ru.json b/plugins/support-assets/lang/ru.json
index c99d2225ae..23335ef2f5 100644
--- a/plugins/support-assets/lang/ru.json
+++ b/plugins/support-assets/lang/ru.json
@@ -1,6 +1,7 @@
 {
   "string": {
     "ContactUs": "Связаться с нами",
-    "ReportBug": "Сообщить об ошибке?"
+    "ReportBug": "Сообщить об ошибке?",
+    "PrivacyPolicy": "Политика конфиденциальности"
   }
 }
diff --git a/plugins/support-assets/lang/zh.json b/plugins/support-assets/lang/zh.json
index 5fd21a2104..773db8465f 100644
--- a/plugins/support-assets/lang/zh.json
+++ b/plugins/support-assets/lang/zh.json
@@ -1,6 +1,7 @@
 {
   "string": {
     "ContactUs": "联系我们",
-    "ReportBug": "报告错误？"
+    "ReportBug": "报告错误？",
+    "PrivacyPolicy": "隐私政策"
   }
 }
diff --git a/plugins/support/src/index.ts b/plugins/support/src/index.ts
index bbe7506f28..712abc96d4 100644
--- a/plugins/support/src/index.ts
+++ b/plugins/support/src/index.ts
@@ -24,6 +24,7 @@ export { deleteSupportConversation, updateSupportConversation } from './utils'
 export const supportLink = 'https://join.slack.com/t/hulycommunity/shared_invite/zt-2cyrevz8g-AGqEDZNsujbn4wHOWd7myg'
 export const reportBugLink = 'https://github.com/hcengineering/platform/issues/new'
 export const docsLink = 'http://docs.huly.io/'
+export const privacyPolicyLink = 'https://v1.huly.io/legal/privacy/'
 
 /**
  * @public
@@ -43,6 +44,7 @@ export default plugin(supportId, {
   },
   string: {
     ContactUs: '' as IntlString,
-    ReportBug: '' as IntlString
+    ReportBug: '' as IntlString,
+    PrivacyPolicy: '' as IntlString
   }
 })
diff --git a/plugins/tags-resources/src/components/TagsPopup.svelte b/plugins/tags-resources/src/components/TagsPopup.svelte
index 0dbcef9d13..e9ab6a7ea7 100644
--- a/plugins/tags-resources/src/components/TagsPopup.svelte
+++ b/plugins/tags-resources/src/components/TagsPopup.svelte
@@ -146,12 +146,15 @@
         kind={'ghost'}
         size={'large'}
         icon={show ? IconView : IconViewHide}
+        dataId={`btn${show ? 'Collapse' : 'Expand'}`}
         on:click={() => {
           show = !show
         }}
       />
     {/if}
-    {#if !hideAdd}<Button kind={'ghost'} size={'large'} icon={IconAdd} on:click={createTagElementPopup} />{/if}
+    {#if !hideAdd}
+      <Button kind={'ghost'} size={'large'} icon={IconAdd} dataId={'btnAdd'} on:click={createTagElementPopup} />
+    {/if}
   </div>
   <div class="scroll">
     <div class="box">
diff --git a/plugins/task-resources/src/components/TypesView.svelte b/plugins/task-resources/src/components/TypesView.svelte
index c3b6ab06bf..b6c59a3662 100644
--- a/plugins/task-resources/src/components/TypesView.svelte
+++ b/plugins/task-resources/src/components/TypesView.svelte
@@ -120,6 +120,7 @@
       resultQuery = mergeQueries(query, e.detail)
     }}
   />
+
   <Component
     is={viewlet.$lookup.descriptor.component}
     props={{
diff --git a/plugins/text-editor-resources/src/components/extension/fileExt.ts b/plugins/text-editor-resources/src/components/extension/fileExt.ts
index d33f51aade..7ab3900fa0 100644
--- a/plugins/text-editor-resources/src/components/extension/fileExt.ts
+++ b/plugins/text-editor-resources/src/components/extension/fileExt.ts
@@ -129,12 +129,14 @@ export const FileExtension = FileNode.extend<FileOptions>({
             const fileId = node.attrs['file-id'] ?? ''
             if (fileId === '') return
             const fileName = node.attrs['data-file-name'] ?? ''
+            const fileType = node.attrs['data-file-type'] ?? ''
 
             showPopup(
               FilePreviewPopup,
               {
                 file: fileId,
                 name: fileName,
+                contentType: fileType,
                 fullSize: false,
                 showIcon: false
               },
diff --git a/plugins/text-editor-resources/src/components/extension/imageExt.ts b/plugins/text-editor-resources/src/components/extension/imageExt.ts
index 82523785fb..262c3cefd3 100644
--- a/plugins/text-editor-resources/src/components/extension/imageExt.ts
+++ b/plugins/text-editor-resources/src/components/extension/imageExt.ts
@@ -151,12 +151,14 @@ export const ImageExtension = ImageNode.extend<ImageOptions>({
 
             const fileId = node.attrs['file-id'] ?? node.attrs.src
             const fileName = node.attrs.alt ?? ''
+            const fileType = node.attrs['data-file-type'] ?? ''
 
             showPopup(
               FilePreviewPopup,
               {
                 file: fileId,
                 name: fileName,
+                contentType: fileType,
                 fullSize: true,
                 showIcon: false
               },
@@ -209,10 +211,22 @@ export async function openImage (editor: Editor): Promise<void> {
   const attributes = editor.getAttributes('image')
   const fileId = attributes['file-id'] ?? attributes.src
   const fileName = attributes.alt ?? ''
+  const fileType = attributes['data-file-type'] ?? ''
   await new Promise<void>((resolve) => {
-    showPopup(FilePreviewPopup, { file: fileId, name: fileName, fullSize: true, showIcon: false }, 'centered', () => {
-      resolve()
-    })
+    showPopup(
+      FilePreviewPopup,
+      {
+        file: fileId,
+        name: fileName,
+        contentType: fileType,
+        fullSize: true,
+        showIcon: false
+      },
+      'centered',
+      () => {
+        resolve()
+      }
+    )
   })
 }
 
diff --git a/plugins/text-editor-resources/src/kits/editor-kit.ts b/plugins/text-editor-resources/src/kits/editor-kit.ts
index 558345f2ba..d0010a7afb 100644
--- a/plugins/text-editor-resources/src/kits/editor-kit.ts
+++ b/plugins/text-editor-resources/src/kits/editor-kit.ts
@@ -12,26 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-import { type Class, type Space, type Doc, type Ref } from '@hcengineering/core'
+import { type Class, type Doc, type Ref, type Space } from '@hcengineering/core'
 import { getResource } from '@hcengineering/platform'
+import { getBlobRef, getClient } from '@hcengineering/presentation'
+import { CodeBlockExtension, codeBlockOptions, CodeExtension, codeOptions } from '@hcengineering/text'
+import textEditor, { type ActionContext, type ExtensionCreator, type TextEditorMode } from '@hcengineering/text-editor'
 import { type AnyExtension, type Editor, Extension } from '@tiptap/core'
 import { type Level } from '@tiptap/extension-heading'
 import ListKeymap from '@tiptap/extension-list-keymap'
 import TableHeader from '@tiptap/extension-table-header'
 import 'prosemirror-codemark/dist/codemark.css'
-import { getBlobRef, getClient } from '@hcengineering/presentation'
-import { CodeBlockExtension, codeBlockOptions, CodeExtension, codeOptions } from '@hcengineering/text'
-import textEditor, { type ActionContext, type ExtensionCreator, type TextEditorMode } from '@hcengineering/text-editor'
 
-import { DefaultKit, type DefaultKitOptions } from './default-kit'
-import { HardBreakExtension } from '../components/extension/hardBreak'
 import { FileExtension, type FileOptions } from '../components/extension/fileExt'
+import { HardBreakExtension } from '../components/extension/hardBreak'
 import { ImageExtension, type ImageOptions } from '../components/extension/imageExt'
-import { NodeUuidExtension } from '../components/extension/nodeUuid'
-import { Table, TableCell, TableRow } from '../components/extension/table'
-import { SubmitExtension, type SubmitOptions } from '../components/extension/submit'
-import { ParagraphExtension } from '../components/extension/paragraph'
 import { InlineToolbarExtension } from '../components/extension/inlineToolbar'
+import { NodeUuidExtension } from '../components/extension/nodeUuid'
+import { ParagraphExtension } from '../components/extension/paragraph'
+import { SubmitExtension, type SubmitOptions } from '../components/extension/submit'
+import { Table, TableCell, TableRow } from '../components/extension/table'
+import { DefaultKit, type DefaultKitOptions } from './default-kit'
 
 export interface EditorKitOptions extends DefaultKitOptions {
   history?: false
@@ -225,7 +225,7 @@ async function buildEditorKit (): Promise<Extension<EditorKitOptions, any>> {
                   inline: true,
                   loadingImgSrc:
                     'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDE2IDE2IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPg0KICAgIDxwYXRoIGQ9Im0gNCAxIGMgLTEuNjQ0NTMxIDAgLTMgMS4zNTU0NjkgLTMgMyB2IDEgaCAxIHYgLTEgYyAwIC0xLjEwOTM3NSAwLjg5MDYyNSAtMiAyIC0yIGggMSB2IC0xIHogbSAyIDAgdiAxIGggNCB2IC0xIHogbSA1IDAgdiAxIGggMSBjIDEuMTA5Mzc1IDAgMiAwLjg5MDYyNSAyIDIgdiAxIGggMSB2IC0xIGMgMCAtMS42NDQ1MzEgLTEuMzU1NDY5IC0zIC0zIC0zIHogbSAtNSA0IGMgLTAuNTUwNzgxIDAgLTEgMC40NDkyMTkgLTEgMSBzIDAuNDQ5MjE5IDEgMSAxIHMgMSAtMC40NDkyMTkgMSAtMSBzIC0wLjQ0OTIxOSAtMSAtMSAtMSB6IG0gLTUgMSB2IDQgaCAxIHYgLTQgeiBtIDEzIDAgdiA0IGggMSB2IC00IHogbSAtNC41IDIgbCAtMiAyIGwgLTEuNSAtMSBsIC0yIDIgdiAwLjUgYyAwIDAuNSAwLjUgMC41IDAuNSAwLjUgaCA3IHMgMC40NzI2NTYgLTAuMDM1MTU2IDAuNSAtMC41IHYgLTEgeiBtIC04LjUgMyB2IDEgYyAwIDEuNjQ0NTMxIDEuMzU1NDY5IDMgMyAzIGggMSB2IC0xIGggLTEgYyAtMS4xMDkzNzUgMCAtMiAtMC44OTA2MjUgLTIgLTIgdiAtMSB6IG0gMTMgMCB2IDEgYyAwIDEuMTA5Mzc1IC0wLjg5MDYyNSAyIC0yIDIgaCAtMSB2IDEgaCAxIGMgMS42NDQ1MzEgMCAzIC0xLjM1NTQ2OSAzIC0zIHYgLTEgeiBtIC04IDMgdiAxIGggNCB2IC0xIHogbSAwIDAiIGZpbGw9IiMyZTM0MzQiIGZpbGwtb3BhY2l0eT0iMC4zNDkwMiIvPg0KPC9zdmc+DQo=',
-                  getBlobRef: async (file, name, size) => await getBlobRef(undefined, file, name, size),
+                  getBlobRef: async (file, name, size) => await getBlobRef(file, name, size),
                   HTMLAttributes: this.options.image?.HTMLAttributes ?? {},
                   ...this.options.image
                 }
diff --git a/plugins/text-editor-resources/src/provider/storage.ts b/plugins/text-editor-resources/src/provider/storage.ts
index 2b1f4ab0c8..fcd4cd3165 100644
--- a/plugins/text-editor-resources/src/provider/storage.ts
+++ b/plugins/text-editor-resources/src/provider/storage.ts
@@ -12,14 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-import core, {
-  collaborativeDocParse,
-  type Blob,
-  type BlobLookup,
-  type CollaborativeDoc,
-  type Ref
-} from '@hcengineering/core'
-import { getBlobHref, getClient } from '@hcengineering/presentation'
+import { collaborativeDocParse, type Blob, type CollaborativeDoc, type Ref } from '@hcengineering/core'
+import { getFileUrl } from '@hcengineering/presentation'
 import { ObservableV2 as Observable } from 'lib0/observable'
 import { applyUpdate, type Doc as YDoc } from 'yjs'
 
@@ -39,11 +33,7 @@ async function fetchContent (blob: Ref<Blob>, doc: YDoc): Promise<boolean> {
 
 async function fetchBlobContent (_id: Ref<Blob>): Promise<Uint8Array | undefined> {
   try {
-    const blob = (await getClient().findOne(core.class.Blob, { _id })) as BlobLookup
-    if (blob === undefined || blob.size === 0) {
-      return undefined
-    }
-    const href = await getBlobHref(blob, _id)
+    const href = getFileUrl(_id)
     const res = await fetch(href)
 
     if (res.ok) {
diff --git a/plugins/time-resources/src/components/Header.svelte b/plugins/time-resources/src/components/Header.svelte
index 178fc2a7a4..743df59ef9 100644
--- a/plugins/time-resources/src/components/Header.svelte
+++ b/plugins/time-resources/src/components/Header.svelte
@@ -58,6 +58,7 @@
       icon={IconChevronLeft}
       kind={'secondary'}
       size={'small'}
+      dataId={'btnPrev'}
       on:click={() => {
         inc(-1)
       }}
@@ -69,6 +70,7 @@
       type={!doubleRow ? 'type-button' : 'type-button-icon'}
       kind={'secondary'}
       size={'small'}
+      dataId={'btnToday'}
       inheritFont
       hasMenu
       disabled={isToday}
@@ -80,6 +82,7 @@
       icon={IconChevronRight}
       kind={'secondary'}
       size={'small'}
+      dataId={'btnNext'}
       on:click={() => {
         inc(1)
       }}
diff --git a/plugins/tracker-resources/src/components/components/ComponentsContent.svelte b/plugins/tracker-resources/src/components/components/ComponentsContent.svelte
index a41b554fa0..552d022d9d 100644
--- a/plugins/tracker-resources/src/components/components/ComponentsContent.svelte
+++ b/plugins/tracker-resources/src/components/components/ComponentsContent.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
+  import core, { DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
   import { Component } from '@hcengineering/tracker'
   import { Loading, Component as ViewComponent } from '@hcengineering/ui'
   import view, { Viewlet, ViewletPreference, ViewOptions } from '@hcengineering/view'
@@ -34,6 +34,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: viewlet._id
       },
       (res) => {
diff --git a/plugins/tracker-resources/src/components/issues/edit/QueryIssuesList.svelte b/plugins/tracker-resources/src/components/issues/edit/QueryIssuesList.svelte
index eeb8cf678f..b31e264fe5 100644
--- a/plugins/tracker-resources/src/components/issues/edit/QueryIssuesList.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/QueryIssuesList.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, DocumentQuery, Ref } from '@hcengineering/core'
+  import core, { Class, Doc, DocumentQuery, Ref } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { Issue } from '@hcengineering/tracker'
   import { Button, Chevron, ExpandCollapse, IconAdd, closeTooltip, resizeObserver, showPopup } from '@hcengineering/ui'
@@ -77,6 +77,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: { $in: configurationRaw.map((it) => it._id) }
       },
       (res) => {
diff --git a/plugins/tracker-resources/src/components/issues/related/RelatedIssuePopup.svelte b/plugins/tracker-resources/src/components/issues/related/RelatedIssuePopup.svelte
new file mode 100644
index 0000000000..8e9fcfcf00
--- /dev/null
+++ b/plugins/tracker-resources/src/components/issues/related/RelatedIssuePopup.svelte
@@ -0,0 +1,225 @@
+<!--
+// Copyright © 2020 Anticrm Platform Contributors.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import core, { SortingOrder, toIdMap, type IdMap, type Ref, type StatusCategory } from '@hcengineering/core'
+  import type { IntlString } from '@hcengineering/platform'
+  import { createQuery, getClient } from '@hcengineering/presentation'
+  import tracker, { type Issue, type Project } from '@hcengineering/tracker'
+  import {
+    createFocusManager,
+    deviceOptionsStore,
+    EditWithIcon,
+    FocusHandler,
+    Icon,
+    IconCheck,
+    IconSearch,
+    Label,
+    ListView,
+    resizeObserver,
+    showPanel,
+    Spinner,
+    type SelectPopupValueType
+  } from '@hcengineering/ui'
+  import { statusStore } from '@hcengineering/view-resources'
+  import { createEventDispatcher } from 'svelte'
+  import { subIssueListProvider, type IssueRef } from '../../../utils'
+  import RelatedIssuePresenter from './RelatedIssuePresenter.svelte'
+
+  export let refs: IssueRef[]
+
+  export let placeholder: IntlString | undefined = undefined
+  export let placeholderParam: any | undefined = undefined
+  export let searchable: boolean = false
+  export let width: 'medium' | 'large' | 'full' = 'medium'
+  export let showShadow: boolean = true
+  export let embedded: boolean = false
+  export let componentLink: boolean = false
+  export let loading: boolean = false
+  export let currentProject: Project
+
+  let popupElement: HTMLDivElement | undefined = undefined
+  let search: string = ''
+
+  const dispatch = createEventDispatcher()
+
+  let selection = 0
+  let list: ListView
+
+  let selected: any
+
+  let subIssues: Issue[] = []
+
+  const query = createQuery()
+  query.query(
+    tracker.class.Issue,
+    { _id: { $in: refs.map((it) => it._id) } },
+    (res) => {
+      subIssues = res
+    },
+    {
+      sort: { rank: SortingOrder.Ascending }
+    }
+  )
+
+  let categories: IdMap<StatusCategory> = new Map()
+
+  void getClient()
+    .findAll(core.class.StatusCategory, {})
+    .then((res) => {
+      categories = toIdMap(res)
+    })
+
+  $: value = subIssues.map((iss) => {
+    const c = $statusStore.byId.get(iss.status)?.category
+    const category = c !== undefined ? categories.get(c) : undefined
+    return {
+      id: iss._id,
+      isSelected: false,
+      component: RelatedIssuePresenter,
+      props: { project: currentProject, issue: iss },
+      category:
+        category !== undefined
+          ? {
+              label: category.label,
+              icon: category.icon
+            }
+          : undefined
+    }
+  })
+
+  $: hasSelected = value.some((v) => v.isSelected)
+
+  function openIssue (target: Ref<Issue>): void {
+    subIssueListProvider(subIssues, target)
+    showPanel(tracker.component.EditIssue, target, tracker.class.Issue, 'content')
+  }
+
+  function sendSelect (id: SelectPopupValueType['id']): void {
+    selected = id
+    openIssue(id as Ref<Issue>)
+  }
+
+  export function onKeydown (key: KeyboardEvent): boolean {
+    if (key.code === 'Tab') {
+      dispatch('close')
+      key.preventDefault()
+      key.stopPropagation()
+      return true
+    }
+    if (key.code === 'ArrowUp') {
+      key.stopPropagation()
+      key.preventDefault()
+      list.select(selection - 1)
+      return true
+    }
+    if (key.code === 'ArrowDown') {
+      key.stopPropagation()
+      key.preventDefault()
+      list.select(selection + 1)
+      return true
+    }
+    if (key.code === 'Enter') {
+      key.preventDefault()
+      key.stopPropagation()
+      sendSelect(value[selection].id)
+      return true
+    }
+    return false
+  }
+  const manager = createFocusManager()
+
+  $: if (popupElement) {
+    popupElement.focus()
+  }
+</script>
+
+<FocusHandler {manager} />
+
+<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+<!-- svelte-ignore a11y-no-static-element-interactions -->
+<div
+  class="selectPopup"
+  bind:this={popupElement}
+  tabindex="0"
+  class:noShadow={!showShadow}
+  class:full-width={width === 'full'}
+  class:max-width-40={width === 'large'}
+  class:embedded
+  use:resizeObserver={() => {
+    dispatch('changeContent')
+  }}
+  on:keydown={onKeydown}
+>
+  {#if searchable}
+    <div class="header">
+      <EditWithIcon
+        icon={IconSearch}
+        size={'large'}
+        width={'100%'}
+        autoFocus={!$deviceOptionsStore.isMobile}
+        bind:value={search}
+        {placeholder}
+        {placeholderParam}
+        on:change
+      />
+    </div>
+  {:else}
+    <div class="menu-space" />
+  {/if}
+  <div class="scroll">
+    <div class="box">
+      <ListView bind:this={list} count={value.length} bind:selection on:changeContent={() => dispatch('changeContent')}>
+        <svelte:fragment slot="item" let:item={itemId}>
+          {@const item = value[itemId]}
+          <button
+            class="menu-item withList w-full"
+            on:click={() => {
+              sendSelect(item.id)
+            }}
+            disabled={loading}
+          >
+            <div class="flex-row-center flex-grow" class:pointer-events-none={!componentLink}>
+              {#if item.component}
+                <div class="flex-grow clear-mins"><svelte:component this={item.component} {...item.props} /></div>
+              {/if}
+              {#if hasSelected}
+                <div class="check">
+                  {#if item.isSelected}
+                    <Icon icon={IconCheck} size={'small'} />
+                  {/if}
+                </div>
+              {/if}
+              {#if item.id === selected && loading}
+                <Spinner size={'small'} />
+              {/if}
+            </div>
+          </button>
+        </svelte:fragment>
+        <svelte:fragment slot="category" let:item={row}>
+          {@const obj = value[row]}
+          {#if obj.category && ((row === 0 && obj.category.label !== undefined) || obj.category.label !== value[row - 1]?.category?.label)}
+            {#if row > 0}<div class="menu-separator" />{/if}
+            <div class="menu-group__header flex-row-center">
+              <span class="overflow-label">
+                <Label label={obj.category.label} />
+              </span>
+            </div>
+          {/if}
+        </svelte:fragment>
+      </ListView>
+    </div>
+  </div>
+  {#if !embedded}<div class="menu-space" />{/if}
+</div>
diff --git a/plugins/tracker-resources/src/components/issues/related/RelatedIssueSelector.svelte b/plugins/tracker-resources/src/components/issues/related/RelatedIssueSelector.svelte
index 03ef6ac954..7d12c757fb 100644
--- a/plugins/tracker-resources/src/components/issues/related/RelatedIssueSelector.svelte
+++ b/plugins/tracker-resources/src/components/issues/related/RelatedIssueSelector.svelte
@@ -13,18 +13,16 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import core, { Doc, IdMap, Ref, SortingOrder, StatusCategory, WithLookup, toIdMap } from '@hcengineering/core'
-  import { createQuery, getClient } from '@hcengineering/presentation'
+  import { Doc, Ref, WithLookup, type Status } from '@hcengineering/core'
   import task from '@hcengineering/task'
-  import { Issue, Project } from '@hcengineering/tracker'
-  import { Button, ButtonKind, ButtonSize, ProgressCircle, SelectPopup, showPanel } from '@hcengineering/ui'
+  import { Project, type Issue } from '@hcengineering/tracker'
+  import { Button, ButtonKind, ButtonSize, ProgressCircle } from '@hcengineering/ui'
   import { statusStore } from '@hcengineering/view-resources'
-  import tracker from '../../../plugin'
-  import { listIssueStatusOrder, subIssueListProvider } from '../../../utils'
-  import RelatedIssuePresenter from './RelatedIssuePresenter.svelte'
+  import { listIssueStatusOrder, relatedIssues, type IssueRef } from '../../../utils'
+  import RelatedIssuePopup from './RelatedIssuePopup.svelte'
 
-  export let object: WithLookup<Doc & { related: number }> | undefined
-  export let value: WithLookup<Doc & { related: number }> | undefined
+  export let object: WithLookup<Doc> | undefined
+  export let value: WithLookup<Doc> | undefined
   export let currentProject: Project | undefined
 
   export let kind: ButtonKind = 'link-bordered'
@@ -33,44 +31,13 @@
   export let width: string | undefined = 'min-contet'
   export let compactMode: boolean = false
 
-  let _subIssues: Issue[] = []
-  let subIssues: Issue[] = []
-  let countComplete: number = 0
-
-  const query = createQuery()
-
   $: _object = object ?? value
 
-  $: _object != null && update(_object)
+  $: subIssues = sortStatuses(_object?._id !== undefined ? [...($relatedIssues.get(_object?._id) ?? [])] : [])
+  let countComplete: number = 0
 
-  function update (value: WithLookup<Doc & { related: number }>): void {
-    if (value.$lookup?.related !== undefined) {
-      query.unsubscribe()
-      _subIssues = value.$lookup.related as Issue[]
-    } else {
-      query.query(
-        tracker.class.Issue,
-        { 'relations._id': value._id, 'relations._class': value._class },
-        (res) => {
-          _subIssues = res
-        },
-        {
-          sort: { rank: SortingOrder.Ascending }
-        }
-      )
-    }
-  }
-
-  let categories: IdMap<StatusCategory> = new Map()
-
-  void getClient()
-    .findAll(core.class.StatusCategory, {})
-    .then((res) => {
-      categories = toIdMap(res)
-    })
-
-  $: {
-    _subIssues.sort((a, b) => {
+  function sortStatuses (statuses: IssueRef[]): { _id: Ref<Issue>, status: Ref<Status> }[] {
+    statuses.sort((a, b) => {
       const aStatus = $statusStore.byId.get(a.status)
       const bStatus = $statusStore.byId.get(b.status)
       return (
@@ -78,39 +45,16 @@
         listIssueStatusOrder.indexOf(bStatus?.category ?? task.statusCategory.UnStarted)
       )
     })
-    subIssues = _subIssues
+    return statuses
   }
 
-  $: if (subIssues != null) {
+  $: if (subIssues.length > 0) {
     const doneStatuses = $statusStore.array
       .filter((s) => s.category === task.statusCategory.Won || s.category === task.statusCategory.Lost)
       .map((p) => p._id)
     countComplete = subIssues.filter((si) => doneStatuses.includes(si.status)).length
   }
-  $: hasSubIssues = (subIssues?.length ?? 0) > 0
-
-  function openIssue (target: Ref<Issue>): void {
-    subIssueListProvider(subIssues, target)
-    showPanel(tracker.component.EditIssue, target, tracker.class.Issue, 'content')
-  }
-
-  $: selectValue = subIssues.map((iss) => {
-    const c = $statusStore.byId.get(iss.status)?.category
-    const category = c !== undefined ? categories.get(c) : undefined
-    return {
-      id: iss._id,
-      isSelected: false,
-      component: RelatedIssuePresenter,
-      props: { project: currentProject, issue: iss },
-      category:
-        category !== undefined
-          ? {
-              label: category.label,
-              icon: category.icon
-            }
-          : undefined
-    }
-  })
+  $: hasSubIssues = subIssues.length > 0
 </script>
 
 {#if hasSubIssues}
@@ -121,10 +65,10 @@
       {size}
       {justify}
       showTooltip={{
-        component: SelectPopup,
+        component: RelatedIssuePopup,
         props: {
-          value: selectValue,
-          onSelect: openIssue,
+          refs: subIssues,
+          currentProject,
           showShadow: false,
           width: 'large'
         }
diff --git a/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte
index 9647cc27c3..73bee061f0 100644
--- a/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
+  import core, { DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
   import { Milestone } from '@hcengineering/tracker'
   import { Component, Loading } from '@hcengineering/ui'
   import view, { Viewlet, ViewletPreference, ViewOptions } from '@hcengineering/view'
@@ -22,6 +22,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: viewlet._id
       },
       (res) => {
diff --git a/plugins/tracker-resources/src/components/templates/IssueTemplatesContent.svelte b/plugins/tracker-resources/src/components/templates/IssueTemplatesContent.svelte
index 1375021441..dd6e9b6f59 100644
--- a/plugins/tracker-resources/src/components/templates/IssueTemplatesContent.svelte
+++ b/plugins/tracker-resources/src/components/templates/IssueTemplatesContent.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
+  import core, { DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
   import { IssueTemplate } from '@hcengineering/tracker'
   import { Component } from '@hcengineering/ui'
@@ -19,6 +19,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: viewlet._id
       },
       (res) => {
diff --git a/plugins/tracker-resources/src/utils.ts b/plugins/tracker-resources/src/utils.ts
index bbc31913a7..ffeaef1445 100644
--- a/plugins/tracker-resources/src/utils.ts
+++ b/plugins/tracker-resources/src/utils.ts
@@ -28,6 +28,7 @@ import core, {
   type DocumentUpdate,
   type Ref,
   type Space,
+  type Status,
   type StatusCategory,
   type TxCollectionCUD,
   type TxCreateDoc,
@@ -52,7 +53,7 @@ import {
 import { PaletteColorIndexes, areDatesEqual, isWeekend } from '@hcengineering/ui'
 import { type KeyFilter, type ViewletDescriptor } from '@hcengineering/view'
 import { CategoryQuery, ListSelectionProvider, statusStore, type SelectDirection } from '@hcengineering/view-resources'
-import { derived, get } from 'svelte/store'
+import { derived, get, writable } from 'svelte/store'
 import tracker from './plugin'
 import { defaultMilestoneStatuses, defaultPriorities } from './types'
 
@@ -570,3 +571,44 @@ export async function getMilestoneTitle (client: TxOperations, ref: Ref<Mileston
 
   return object?.label ?? ''
 }
+
+export interface IssueRef {
+  status: Ref<Status>
+  _id: Ref<Issue>
+}
+export type IssueReverseRevMap = Map<Ref<Doc>, IssueRef[]>
+export const relatedIssues = writable<IssueReverseRevMap>(new Map())
+
+function fillStores (): void {
+  const client = getClient()
+
+  if (client !== undefined) {
+    const relatedIssuesQuery = createQuery(true)
+
+    relatedIssuesQuery.query(
+      tracker.class.Issue,
+      { 'relations._id': { $exists: true } },
+      (res) => {
+        const nMap: IssueReverseRevMap = new Map()
+        for (const r of res) {
+          for (const rr of r.relations ?? []) {
+            nMap.set(rr._id, [...(nMap.get(rr._id) ?? []), { _id: r._id, status: r.status }])
+          }
+        }
+        relatedIssues.set(nMap)
+      },
+      {
+        projection: {
+          relations: 1,
+          status: 1
+        }
+      }
+    )
+  } else {
+    setTimeout(() => {
+      fillStores()
+    }, 50)
+  }
+}
+
+fillStores()
diff --git a/plugins/view-resources/src/components/Table.svelte b/plugins/view-resources/src/components/Table.svelte
index efff426c7c..a1d6f8944b 100644
--- a/plugins/view-resources/src/components/Table.svelte
+++ b/plugins/view-resources/src/components/Table.svelte
@@ -154,10 +154,31 @@
     query,
     (result) => {
       total = result.total
+      if (totalQuery === undefined) {
+        gtotal = total
+      }
     },
     { limit: 1, ...options, sort: getSort(_sortKey), lookup, total: true }
   )
 
+  const totalQueryQ = createQuery()
+  $: if (totalQuery !== undefined) {
+    totalQueryQ.query(
+      _class,
+      totalQuery,
+      (result) => {
+        gtotal = result.total === -1 ? 0 : result.total
+      },
+      {
+        lookup,
+        limit: 1,
+        total: true
+      }
+    )
+  } else {
+    gtotal = total
+  }
+
   const showContextMenu = async (ev: MouseEvent, object: Doc, row: number): Promise<void> => {
     selection = row
     if (!checkedSet.has(object._id)) {
@@ -258,20 +279,6 @@
 
   let width: number
 
-  const totalQueryQ = createQuery()
-  $: totalQueryQ.query(
-    _class,
-    totalQuery ?? query ?? {},
-    (result) => {
-      gtotal = result.total === -1 ? 0 : result.total
-    },
-    {
-      lookup,
-      limit: 1,
-      total: true
-    }
-  )
-
   let isBuildingModel = true
   let model: AttributeModel[] | undefined
   let modelOptions: BuildModelOptions | undefined
diff --git a/plugins/view-resources/src/components/TableBrowser.svelte b/plugins/view-resources/src/components/TableBrowser.svelte
index bb50925bf9..8cba6ae5a6 100644
--- a/plugins/view-resources/src/components/TableBrowser.svelte
+++ b/plugins/view-resources/src/components/TableBrowser.svelte
@@ -88,6 +88,7 @@
     mode: 'browser'
   }}
 />
+
 <Scroller {fade} horizontal={true}>
   <Table
     bind:this={table}
diff --git a/plugins/view-resources/src/components/ViewletContentView.svelte b/plugins/view-resources/src/components/ViewletContentView.svelte
index e9fdb97c00..45b191ba4c 100644
--- a/plugins/view-resources/src/components/ViewletContentView.svelte
+++ b/plugins/view-resources/src/components/ViewletContentView.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Class, Doc, DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
+  import core, { Class, Doc, DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { AnySvelteComponent, Component, Loading } from '@hcengineering/ui'
@@ -44,6 +44,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: { $in: configurationRaw.map((it) => it._id) }
       },
       (res) => {
diff --git a/plugins/view-resources/src/components/ViewletSelector.svelte b/plugins/view-resources/src/components/ViewletSelector.svelte
index 8cad342d2f..8d0feb7776 100644
--- a/plugins/view-resources/src/components/ViewletSelector.svelte
+++ b/plugins/view-resources/src/components/ViewletSelector.svelte
@@ -3,7 +3,7 @@
   import { activeViewlet, makeViewletKey, setActiveViewletId } from '../utils'
   import { resolvedLocationStore, Switcher } from '@hcengineering/ui'
   import view, { Viewlet, ViewletPreference } from '@hcengineering/view'
-  import { DocumentQuery, Ref, WithLookup } from '@hcengineering/core'
+  import core, { DocumentQuery, Ref, WithLookup } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
 
   export let viewlet: WithLookup<Viewlet> | undefined
@@ -69,6 +69,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: viewlet._id
       },
       (res) => {
diff --git a/plugins/view-resources/src/components/ViewletSetting.svelte b/plugins/view-resources/src/components/ViewletSetting.svelte
index 232d4928c1..cdc0a870d0 100644
--- a/plugins/view-resources/src/components/ViewletSetting.svelte
+++ b/plugins/view-resources/src/components/ViewletSetting.svelte
@@ -55,6 +55,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: { $in: Array.from(viewlets.map((it) => it._id)) }
       },
       (res) => {
diff --git a/plugins/view-resources/src/components/ViewletsSettingButton.svelte b/plugins/view-resources/src/components/ViewletsSettingButton.svelte
index f53d8bf118..769f5f731b 100644
--- a/plugins/view-resources/src/components/ViewletsSettingButton.svelte
+++ b/plugins/view-resources/src/components/ViewletsSettingButton.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { DocumentQuery, WithLookup } from '@hcengineering/core'
+  import core, { DocumentQuery, WithLookup } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
   import { ModernButton, showPopup, closeTooltip } from '@hcengineering/ui'
   import { ViewOptions, Viewlet, ViewletPreference } from '@hcengineering/view'
@@ -72,6 +72,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: viewlet._id
       },
       (res) => {
diff --git a/plugins/view-resources/src/components/filter/FilterSection.svelte b/plugins/view-resources/src/components/filter/FilterSection.svelte
index a374d710da..30697acd62 100644
--- a/plugins/view-resources/src/components/filter/FilterSection.svelte
+++ b/plugins/view-resources/src/components/filter/FilterSection.svelte
@@ -118,6 +118,7 @@
   </button>
   <button
     class="filter-button hoverable lower"
+    data-id="btnCondition"
     on:click={(e) => {
       clickHandler(e, false)
     }}
diff --git a/plugins/view-resources/src/components/viewer/AudioPlayer.svelte b/plugins/view-resources/src/components/viewer/AudioPlayer.svelte
index 64a00f1d7e..eca4cde120 100644
--- a/plugins/view-resources/src/components/viewer/AudioPlayer.svelte
+++ b/plugins/view-resources/src/components/viewer/AudioPlayer.svelte
@@ -16,11 +16,11 @@
   import { type Blob, type Ref } from '@hcengineering/core'
   import { CircleButton, Progress } from '@hcengineering/ui'
 
-  import { getBlobSrcFor } from '@hcengineering/presentation'
+  import { getFileUrl } from '@hcengineering/presentation'
   import Pause from '../icons/Pause.svelte'
   import Play from '../icons/Play.svelte'
 
-  export let value: Blob | Ref<Blob>
+  export let value: Ref<Blob>
   export let name: string
   export let contentType: string
   export let fullSize = false
@@ -49,9 +49,7 @@
 </div>
 
 <audio bind:duration bind:currentTime={time} bind:paused>
-  {#await getBlobSrcFor(value, name) then src}
-    <source {src} type={contentType} />
-  {/await}
+  <source src={getFileUrl(value, name)} type={contentType} />
 </audio>
 
 <style lang="scss">
diff --git a/plugins/view-resources/src/components/viewer/AudioViewer.svelte b/plugins/view-resources/src/components/viewer/AudioViewer.svelte
index 84b0023da2..fcf3f0282e 100644
--- a/plugins/view-resources/src/components/viewer/AudioViewer.svelte
+++ b/plugins/view-resources/src/components/viewer/AudioViewer.svelte
@@ -14,13 +14,11 @@
 -->
 <script lang="ts">
   import { type Blob, type Ref } from '@hcengineering/core'
-  import { type BlobMetadata } from '@hcengineering/presentation'
   import AudioPlayer from './AudioPlayer.svelte'
 
-  export let value: Blob | Ref<Blob>
+  export let value: Ref<Blob>
   export let name: string
   export let contentType: string
-  export let metadata: BlobMetadata | undefined
 </script>
 
 <AudioPlayer {value} {name} {contentType} fullSize={true} />
diff --git a/plugins/view-resources/src/components/viewer/ImageViewer.svelte b/plugins/view-resources/src/components/viewer/ImageViewer.svelte
index 5c7b510a25..592e1de2c4 100644
--- a/plugins/view-resources/src/components/viewer/ImageViewer.svelte
+++ b/plugins/view-resources/src/components/viewer/ImageViewer.svelte
@@ -17,12 +17,12 @@
   import { getBlobRef, type BlobMetadata } from '@hcengineering/presentation'
   import { Loading } from '@hcengineering/ui'
 
-  export let value: Blob | Ref<Blob>
+  export let value: Ref<Blob>
   export let name: string
   export let metadata: BlobMetadata | undefined
   export let fit: boolean = false
 
-  $: p = typeof value === 'string' ? getBlobRef(undefined, value, name) : getBlobRef(value, value._id)
+  $: p = getBlobRef(value, name)
   $: width = metadata?.originalWidth ? `min(${metadata.originalWidth / metadata?.pixelRatio ?? 1}px, 100%)` : '100%'
   $: height = metadata?.originalHeight
     ? `min(${metadata.originalHeight / metadata?.pixelRatio ?? 1}px, ${fit ? '100%' : '80vh'})`
diff --git a/plugins/view-resources/src/components/viewer/PDFViewer.svelte b/plugins/view-resources/src/components/viewer/PDFViewer.svelte
index 914ca76c1e..c8cf974dab 100644
--- a/plugins/view-resources/src/components/viewer/PDFViewer.svelte
+++ b/plugins/view-resources/src/components/viewer/PDFViewer.svelte
@@ -14,17 +14,14 @@
 -->
 <script lang="ts">
   import { type Blob, type Ref } from '@hcengineering/core'
-  import { getBlobSrcFor, type BlobMetadata } from '@hcengineering/presentation'
+  import { getFileUrl } from '@hcengineering/presentation'
 
-  export let value: Blob | Ref<Blob>
+  export let value: Ref<Blob>
   export let name: string
-  export let metadata: BlobMetadata | undefined
   export let fit: boolean = false
 </script>
 
-{#await getBlobSrcFor(value, name) then href}
-  <iframe class:fit src={href + '#view=FitH&navpanes=0'} title={name} />
-{/await}
+<iframe class:fit src={getFileUrl(value, name) + '#view=FitH&navpanes=0'} title={name} />
 
 <style lang="scss">
   iframe {
diff --git a/plugins/view-resources/src/components/viewer/VideoViewer.svelte b/plugins/view-resources/src/components/viewer/VideoViewer.svelte
index 9f582e9adb..e91194496d 100644
--- a/plugins/view-resources/src/components/viewer/VideoViewer.svelte
+++ b/plugins/view-resources/src/components/viewer/VideoViewer.svelte
@@ -14,25 +14,20 @@
 -->
 <script lang="ts">
   import { type Blob, type Ref } from '@hcengineering/core'
-  import { getBlobSrcFor, type BlobMetadata } from '@hcengineering/presentation'
+  import { getFileUrl, type BlobMetadata } from '@hcengineering/presentation'
 
-  export let value: Blob | Ref<Blob>
+  export let value: Ref<Blob>
   export let name: string
   export let metadata: BlobMetadata | undefined
   export let fit: boolean = false
 
   $: maxWidth = metadata?.originalWidth ? `min(${metadata.originalWidth}px, 100%)` : undefined
   $: maxHeight = metadata?.originalHeight ? `min(${metadata.originalHeight}px, 80vh)` : undefined
+
+  $: src = getFileUrl(value, name)
 </script>
 
-{#await getBlobSrcFor(value, name) then src}
-  <video
-    style:max-width={fit ? '100%' : maxWidth}
-    style:max-height={fit ? '100%' : maxHeight}
-    controls
-    preload={'auto'}
-  >
-    <source {src} />
-    <track kind="captions" label={name} />
-  </video>
-{/await}
+<video style:max-width={fit ? '100%' : maxWidth} style:max-height={fit ? '100%' : maxHeight} controls preload={'auto'}>
+  <source {src} />
+  <track kind="captions" label={name} />
+</video>
diff --git a/plugins/view-resources/src/utils.ts b/plugins/view-resources/src/utils.ts
index e2c8f57150..7f5ba88114 100644
--- a/plugins/view-resources/src/utils.ts
+++ b/plugins/view-resources/src/utils.ts
@@ -474,7 +474,10 @@ export function buildConfigLookup<T extends Doc> (
       ...((existingLookup as ReverseLookups)._id ?? {}),
       ...((res as ReverseLookups)._id ?? {})
     }
-    res = { ...existingLookup, ...res, _id }
+    res = { ...existingLookup, ...res }
+    if (Object.keys(_id).length > 0) {
+      ;(res as any)._id = _id
+    }
   }
   return res
 }
diff --git a/plugins/workbench-resources/src/components/HelpAndSupport.svelte b/plugins/workbench-resources/src/components/HelpAndSupport.svelte
index ad17607656..a3249eed0d 100644
--- a/plugins/workbench-resources/src/components/HelpAndSupport.svelte
+++ b/plugins/workbench-resources/src/components/HelpAndSupport.svelte
@@ -16,7 +16,7 @@
   import { Asset, IntlString } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
   import setting, { settingId } from '@hcengineering/setting'
-  import support, { docsLink, reportBugLink, supportLink } from '@hcengineering/support'
+  import support, { docsLink, reportBugLink, supportLink, privacyPolicyLink } from '@hcengineering/support'
   import {
     AnySvelteComponent,
     Button,
@@ -199,6 +199,9 @@
     </Scroller>
   {/if}
   <div class="footer">
+    <a href={privacyPolicyLink} target="_blank">
+      <Button id="privacy-policy" kind={'ghost'} label={support.string.PrivacyPolicy} stopPropagation={false} />
+    </a>
     <a href={reportBugLink} target="_blank">
       <Button id="report-a-bug" kind={'primary'} label={support.string.ReportBug} stopPropagation={false} />
     </a>
diff --git a/plugins/workbench-resources/src/components/Navigator.svelte b/plugins/workbench-resources/src/components/Navigator.svelte
index 6b7df89106..1672d1375c 100644
--- a/plugins/workbench-resources/src/components/Navigator.svelte
+++ b/plugins/workbench-resources/src/components/Navigator.svelte
@@ -42,17 +42,21 @@
 
   $: if (model) {
     const classes = getSpecialSpaceClass(model).flatMap((c) => hierarchy.getDescendants(c))
-    query.query(
-      core.class.Space,
-      {
-        _class: { $in: classes },
-        members: getCurrentAccount()._id
-      },
-      (result) => {
-        spaces = result
-      },
-      { sort: { name: SortingOrder.Ascending } }
-    )
+    if (classes.length > 0) {
+      query.query(
+        core.class.Space,
+        {
+          _class: classes.length === 1 ? classes[0] : { $in: classes },
+          members: getCurrentAccount()._id
+        },
+        (result) => {
+          spaces = result
+        },
+        { sort: { name: SortingOrder.Ascending } }
+      )
+    } else {
+      query.unsubscribe()
+    }
   }
 
   let specials: SpecialNavModel[] = []
diff --git a/plugins/workbench-resources/src/components/SavedView.svelte b/plugins/workbench-resources/src/components/SavedView.svelte
index 3ca2694275..c2d66a674d 100644
--- a/plugins/workbench-resources/src/components/SavedView.svelte
+++ b/plugins/workbench-resources/src/components/SavedView.svelte
@@ -47,22 +47,28 @@
   const filteredViewsQuery = createQuery()
   let availableFilteredViews: FilteredView[] = []
   let myFilteredViews: FilteredView[] = []
-  $: filteredViewsQuery.query<FilteredView>(
-    view.class.FilteredView,
-    { attachedTo: currentApplication?.alias },
-    (result) => {
-      myFilteredViews = result.filter((p) => p.users.includes(me))
-      availableFilteredViews = result.filter((p) => p.sharable && !p.users.includes(me))
+  $: if (currentApplication?.alias !== undefined) {
+    filteredViewsQuery.query<FilteredView>(
+      view.class.FilteredView,
+      { attachedTo: currentApplication?.alias },
+      (result) => {
+        myFilteredViews = result.filter((p) => p.users.includes(me))
+        availableFilteredViews = result.filter((p) => p.sharable && !p.users.includes(me))
 
-      const location = getLocation()
-      if (location.query?.filterViewId) {
-        const targetView = result.find((view) => view._id === location.query?.filterViewId)
-        if (targetView) {
-          load(targetView)
+        const location = getLocation()
+        if (location.query?.filterViewId) {
+          const targetView = result.find((view) => view._id === location.query?.filterViewId)
+          if (targetView) {
+            load(targetView)
+          }
         }
       }
-    }
-  )
+    )
+  } else {
+    filteredViewsQuery.unsubscribe()
+    myFilteredViews = []
+    availableFilteredViews = []
+  }
 
   async function removeAction (filteredView: FilteredView): Promise<Action[]> {
     return [
diff --git a/plugins/workbench-resources/src/components/SpaceContent.svelte b/plugins/workbench-resources/src/components/SpaceContent.svelte
index 877343f7b0..e0589cbc6b 100644
--- a/plugins/workbench-resources/src/components/SpaceContent.svelte
+++ b/plugins/workbench-resources/src/components/SpaceContent.svelte
@@ -15,6 +15,7 @@
 -->
 <script lang="ts">
   import type { Class, Doc, Ref, Space, WithLookup } from '@hcengineering/core'
+  import core from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
   import { AnyComponent, Component, Loading } from '@hcengineering/ui'
@@ -42,6 +43,7 @@
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
+        space: core.space.Workspace,
         attachedTo: viewlet._id
       },
       (res) => {
diff --git a/plugins/workbench-resources/src/components/SpaceHeader.svelte b/plugins/workbench-resources/src/components/SpaceHeader.svelte
index 92d3fdc9fc..ac23b80570 100644
--- a/plugins/workbench-resources/src/components/SpaceHeader.svelte
+++ b/plugins/workbench-resources/src/components/SpaceHeader.svelte
@@ -57,9 +57,14 @@
 
   const prevSpaceId = spaceId
 
-  $: query.query(core.class.Space, { _id: spaceId }, (result) => {
-    space = result[0]
-  })
+  $: query.query(
+    core.class.Space,
+    { _id: spaceId },
+    (result) => {
+      space = result[0]
+    },
+    { limit: 1 }
+  )
 
   function showCreateDialog (ev: Event) {
     showPopup(createItemDialog as AnyComponent, { space: spaceId }, 'top')
diff --git a/plugins/workbench-resources/src/components/navigator/SpacePanel.svelte b/plugins/workbench-resources/src/components/navigator/SpacePanel.svelte
index 461e8df3a4..01cb497673 100644
--- a/plugins/workbench-resources/src/components/navigator/SpacePanel.svelte
+++ b/plugins/workbench-resources/src/components/navigator/SpacePanel.svelte
@@ -36,9 +36,14 @@
   const clazz = client.getHierarchy().getClass(_class)
 
   const query = createQuery()
-  $: query.query(core.class.Space, { _id }, (result) => {
-    space = result[0]
-  })
+  $: query.query(
+    core.class.Space,
+    { _id },
+    (result) => {
+      space = result[0]
+    },
+    { limit: 1 }
+  )
 
   function onNameChange (ev: Event) {
     const value = (ev.target as HTMLInputElement).value
@@ -46,9 +51,14 @@
       client.updateDoc(_class, space.space, space._id, { name: value })
     } else {
       // Just refresh value
-      query.query(core.class.Space, { _id }, (result) => {
-        space = result[0]
-      })
+      query.query(
+        core.class.Space,
+        { _id },
+        (result) => {
+          space = result[0]
+        },
+        { limit: 1 }
+      )
     }
   }
 </script>
diff --git a/plugins/workbench-resources/src/components/statistics/MetricsInfo.svelte b/plugins/workbench-resources/src/components/statistics/MetricsInfo.svelte
index 78108061ae..379cdc5c2c 100644
--- a/plugins/workbench-resources/src/components/statistics/MetricsInfo.svelte
+++ b/plugins/workbench-resources/src/components/statistics/MetricsInfo.svelte
@@ -9,7 +9,10 @@
   export let level = 0
   export let name: string = 'System'
 
-  $: haschilds = Object.keys(metrics.measurements).length > 0 || Object.keys(metrics.params).length > 0
+  $: haschilds =
+    Object.keys(metrics.measurements).length > 0 ||
+    Object.keys(metrics.params).length > 0 ||
+    (metrics.topResult?.length ?? 0) > 0
 
   function showAvg (name: string, time: number, ops: number): string {
     if (name.startsWith('#')) {
@@ -76,13 +79,13 @@
         {#each metrics.topResult ?? [] as r}
           <Expandable>
             <svelte:fragment slot="title">
-              <div class="flex-row-center flex-between flex-grow">
+              <div class="flex-row-center flex-between flex-grow select-text">
                 Time:{r.value}
               </div>
             </svelte:fragment>
-            <pre>
-          {JSON.stringify(r, null, 2)}
-        </pre>
+            <pre class="select-text">
+              {JSON.stringify(r, null, 2)}
+            </pre>
           </Expandable>
         {/each}
       </Expandable>
@@ -127,9 +130,9 @@
                       Time:{r.value}
                     </div>
                   </svelte:fragment>
-                  <pre>
-                  {JSON.stringify(r, null, 2)}
-                </pre>
+                  <pre class="select-text">
+                    {JSON.stringify(r, null, 2)}
+                  </pre>
                 </Expandable>
               {/each}
             </div>
diff --git a/pods/account/package.json b/pods/account/package.json
index 7afc44b506..3d3e661abe 100644
--- a/pods/account/package.json
+++ b/pods/account/package.json
@@ -17,6 +17,7 @@
     "bundle": "mkdir -p bundle && esbuild src/__start.ts --bundle --define:process.env.MODEL_VERSION=$(node ../../common/scripts/show_version.js) --minify --platform=node > bundle/bundle.js",
     "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/account",
     "docker:tbuild": "docker build -t hardcoreeng/account . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/account",
+    "docker:abuild": "docker build -t hardcoreeng/account . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/account",
     "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/account staging",
     "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/account",
     "run-local": "cross-env MONGO_URL=mongodb://localhost:27017 MINIO_ACCESS_KEY=minioadmi MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' TRANSACTOR_URL=ws://localhost:3333 ts-node src/__start.ts",
diff --git a/pods/collaborator/package.json b/pods/collaborator/package.json
index 1824082a25..feebcac7c0 100644
--- a/pods/collaborator/package.json
+++ b/pods/collaborator/package.json
@@ -15,6 +15,8 @@
     "_phase:docker-staging": "rushx docker:staging",
     "bundle": "mkdir -p bundle && esbuild src/__start.ts --bundle --platform=node --keep-names > bundle/bundle.js",
     "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/collaborator",
+    "docker:tbuild": "docker build -t hardcoreeng/collaborator . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/collaborator",
+    "docker:abuild": "docker build -t hardcoreeng/collaborator . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/collaborator",
     "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/collaborator staging",
     "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/collaborator",
     "run-local": "cross-env MONGO_URL=mongodb://localhost:27017 SECRET=secret MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin ts-node src/__start.ts",
diff --git a/pods/front/package.json b/pods/front/package.json
index 6f5050d442..fe860f4f4b 100644
--- a/pods/front/package.json
+++ b/pods/front/package.json
@@ -20,6 +20,7 @@
     "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/front staging",
     "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/front",
     "docker:tbuild": "docker build -t hardcoreeng/front . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/front",
+    "docker:abuild": "docker build -t hardcoreeng/front . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/front",
     "format": "format src",
     "run-local": "cross-env MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' ACCOUNTS_URL=http://localhost:3000 UPLOAD_URL=/files ELASTIC_URL=http://localhost:9200 MODEL_VERSION=$(node ../../common/scripts/show_version.js) VERSION=$(node ../../common/scripts/show_tag.js) PUBLIC_DIR='.' ts-node ./src/__start.ts",
     "test": "jest --passWithNoTests --silent --forceExit",
diff --git a/pods/server/package.json b/pods/server/package.json
index 90214c6c8d..609152ce69 100644
--- a/pods/server/package.json
+++ b/pods/server/package.json
@@ -8,9 +8,9 @@
   "template": "@hcengineering/node-package",
   "license": "EPL-2.0",
   "scripts": {
-    "start": "rush bundle --to @hcengineering/server && cross-env NODE_ENV=production ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret node --inspect --enable-source-maps bundle/bundle.js",
-    "start-u": "rush bundle --to @hcengineering/server && cp ./node_modules/@hcengineering/uws/lib/*.node ./bundle/ && cross-env NODE_ENV=production SERVER_PROVIDER=uweb ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret node --inspect bundle/bundle.js",
-    "start-flame": "rush bundle --to @hcengineering/server && cross-env NODE_ENV=production ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts",
+    "start": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret node --inspect --enable-source-maps bundle/bundle.js",
+    "start-u": "rush bundle --to @hcengineering/pod-server && cp ./node_modules/@hcengineering/uws/lib/*.node ./bundle/ && cross-env NODE_ENV=production SERVER_PROVIDER=uweb ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret node --inspect bundle/bundle.js",
+    "start-flame": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts",
     "build": "compile",
     "_phase:bundle": "rushx bundle",
     "_phase:docker-build": "rushx docker:build",
@@ -18,6 +18,7 @@
     "bundle": "mkdir -p bundle && esbuild src/__start.ts --minify --bundle --keep-names --platform=node --external:*.node --external:bufferutil --external:utf-8-validate --define:process.env.MODEL_VERSION=$(node ../../common/scripts/show_version.js) --define:process.env.GIT_REVISION=$(../../common/scripts/git_version.sh) --outfile=bundle/bundle.js --log-level=error --sourcemap=external",
     "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/transactor",
     "docker:tbuild": "docker build -t hardcoreeng/transactor . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/transactor",
+    "docker:abuild": "docker build -t hardcoreeng/transactor . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/transactor",
     "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/transactor staging",
     "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/transactor",
     "build:watch": "compile",
diff --git a/server-plugins/activity-resources/src/index.ts b/server-plugins/activity-resources/src/index.ts
index 2f5c5718c4..d2da99eea2 100644
--- a/server-plugins/activity-resources/src/index.ts
+++ b/server-plugins/activity-resources/src/index.ts
@@ -54,13 +54,13 @@ export async function OnReactionChanged (originTx: Tx, control: TriggerControl):
     const txes = await createReactionNotifications(tx, control)
 
     await control.apply(txes, true)
-    return txes
+    return []
   }
 
   if (innerTx._class === core.class.TxRemoveDoc) {
     const txes = await removeReactionNotifications(tx, control)
     await control.apply(txes, true)
-    return txes
+    return []
   }
 
   return []
@@ -136,6 +136,7 @@ export async function createReactionNotifications (
 
   res = res.concat(
     await createCollabDocInfo(
+      control.ctx,
       [user] as Ref<PersonAccount>[],
       control,
       tx.tx,
@@ -389,7 +390,7 @@ async function ActivityMessagesHandler (tx: TxCUD<Doc>, control: TriggerControl)
   const messages = txes.map((messageTx) => TxProcessor.createDoc2Doc(messageTx.tx as TxCreateDoc<DocUpdateMessage>))
 
   const notificationTxes = await control.ctx.with(
-    'createNotificationTxes',
+    'createCollaboratorNotifications',
     {},
     async (ctx) => await createCollaboratorNotifications(ctx, tx, control, messages)
   )
diff --git a/server-plugins/activity-resources/src/references.ts b/server-plugins/activity-resources/src/references.ts
index 1aebe4fbf2..f65d49b876 100644
--- a/server-plugins/activity-resources/src/references.ts
+++ b/server-plugins/activity-resources/src/references.ts
@@ -248,7 +248,7 @@ async function checkSpace (
   control: TriggerControl,
   res: Tx[]
 ): Promise<boolean> {
-  const space = (await control.findAll<Space>(core.class.Space, { _id: spaceId }))[0]
+  const space = (await control.findAll<Space>(core.class.Space, { _id: spaceId }, { limit: 1 }))[0]
   const isMember = space.members.includes(user._id)
   if (space.private) {
     return isMember
diff --git a/server-plugins/activity-resources/src/utils.ts b/server-plugins/activity-resources/src/utils.ts
index 7a0aa17e46..632f5ce0e8 100644
--- a/server-plugins/activity-resources/src/utils.ts
+++ b/server-plugins/activity-resources/src/utils.ts
@@ -166,7 +166,10 @@ async function getCollaboratorsDiff (
     prevValue = hierarchy.as(prevDoc, notification.mixin.Collaborators).collaborators ?? []
   } else if (prevDoc !== undefined) {
     const mixin = hierarchy.classHierarchyMixin(prevDoc._class, notification.mixin.ClassCollaborators)
-    prevValue = mixin !== undefined ? await getDocCollaborators(prevDoc, mixin, control as TriggerControl) : []
+    prevValue =
+      mixin !== undefined
+        ? await getDocCollaborators((control as TriggerControl).ctx, prevDoc, mixin, control as TriggerControl)
+        : []
   }
 
   const added = value.filter((item) => !prevValue.includes(item)) as DocAttributeUpdates['added']
diff --git a/server-plugins/chunter-resources/src/index.ts b/server-plugins/chunter-resources/src/index.ts
index cca3a0654b..ab757ee382 100644
--- a/server-plugins/chunter-resources/src/index.ts
+++ b/server-plugins/chunter-resources/src/index.ts
@@ -201,7 +201,7 @@ async function OnChatMessageCreated (tx: TxCUD<Doc>, control: TriggerControl): P
       )
     }
   } else {
-    const collaborators = await getDocCollaborators(targetDoc, mixin, control)
+    const collaborators = await getDocCollaborators(control.ctx, targetDoc, mixin, control)
     if (!collaborators.includes(message.modifiedBy)) {
       collaborators.push(message.modifiedBy)
     }
@@ -542,12 +542,11 @@ async function hideOldChannels (
   return res
 }
 
-async function updateChatInfo (control: TriggerControl, status: UserStatus, date: Timestamp): Promise<void> {
+export async function updateChatInfo (control: TriggerControl, status: UserStatus, date: Timestamp): Promise<void> {
   const account = await control.modelDb.findOne(contact.class.PersonAccount, { _id: status.user as Ref<PersonAccount> })
   if (account === undefined) return
 
-  const chatUpdates = await control.queryFind(chunter.class.ChatInfo, {})
-  const update = chatUpdates.find(({ user }) => user === account.person)
+  const update = (await control.findAll(chunter.class.ChatInfo, { user: account.person })).shift()
   const shouldUpdate = update === undefined || date - update.timestamp > updateChatInfoDelay
 
   if (!shouldUpdate) return
@@ -608,23 +607,23 @@ async function updateChatInfo (control: TriggerControl, status: UserStatus, date
 }
 
 async function OnUserStatus (originTx: TxCUD<UserStatus>, control: TriggerControl): Promise<Tx[]> {
-  const tx = TxProcessor.extractTx(originTx) as TxCUD<UserStatus>
-  if (tx.objectClass !== core.class.UserStatus) return []
-  if (tx._class === core.class.TxCreateDoc) {
-    const createTx = tx as TxCreateDoc<UserStatus>
-    const { online } = createTx.attributes
-    if (online) {
-      const status = TxProcessor.createDoc2Doc(createTx)
-      await updateChatInfo(control, status, originTx.modifiedOn)
-    }
-  } else if (tx._class === core.class.TxUpdateDoc) {
-    const updateTx = tx as TxUpdateDoc<UserStatus>
-    const { online } = updateTx.operations
-    if (online === true) {
-      const status = (await control.findAll(core.class.UserStatus, { _id: updateTx.objectId }))[0]
-      await updateChatInfo(control, status, originTx.modifiedOn)
-    }
-  }
+  // const tx = TxProcessor.extractTx(originTx) as TxCUD<UserStatus>
+  // if (tx.objectClass !== core.class.UserStatus) return []
+  // if (tx._class === core.class.TxCreateDoc) {
+  //   const createTx = tx as TxCreateDoc<UserStatus>
+  //   const { online } = createTx.attributes
+  //   if (online) {
+  //     const status = TxProcessor.createDoc2Doc(createTx)
+  //     await updateChatInfo(control, status, originTx.modifiedOn)
+  //   }
+  // } else if (tx._class === core.class.TxUpdateDoc) {
+  //   const updateTx = tx as TxUpdateDoc<UserStatus>
+  //   const { online } = updateTx.operations
+  //   if (online === true) {
+  //     const status = (await control.findAll(core.class.UserStatus, { _id: updateTx.objectId }))[0]
+  //     await updateChatInfo(control, status, originTx.modifiedOn)
+  //   }
+  // }
 
   return []
 }
@@ -633,19 +632,17 @@ async function OnContextUpdate (tx: TxUpdateDoc<DocNotifyContext>, control: Trig
   const hasUpdate = 'lastUpdateTimestamp' in tx.operations && tx.operations.lastUpdateTimestamp !== undefined
   if (!hasUpdate) return []
 
-  const chatUpdates = await control.queryFind(chunter.class.ChatInfo, {})
-  for (const update of chatUpdates) {
-    if (update.hidden.includes(tx.objectId)) {
-      return [
-        control.txFactory.createTxMixin(tx.objectId, tx.objectClass, tx.objectSpace, chunter.mixin.ChannelInfo, {
-          hidden: false
-        }),
-        control.txFactory.createTxUpdateDoc(update._class, update.space, update._id, {
-          hidden: update.hidden.filter((id) => id !== tx.objectId)
-        })
-      ]
-    }
-  }
+  // const update = (await control.findAll(notification.class.DocNotifyContext, { _id: tx.objectId }, { limit: 1 })).shift()
+  // if (update !== undefined) {
+  //   const as = control.hierarchy.as(update, chunter.mixin.ChannelInfo)
+  //   if (as.hidden) {
+  //     return [
+  //       control.txFactory.createTxMixin(tx.objectId, tx.objectClass, tx.objectSpace, chunter.mixin.ChannelInfo, {
+  //         hidden: false
+  //       })
+  //     ]
+  //   }
+  // }
 
   return []
 }
diff --git a/server-plugins/notification-resources/src/index.ts b/server-plugins/notification-resources/src/index.ts
index e25fd5e744..a3113231f4 100644
--- a/server-plugins/notification-resources/src/index.ts
+++ b/server-plugins/notification-resources/src/index.ts
@@ -284,6 +284,7 @@ async function getKeyCollaborators (
  * @public
  */
 export async function getDocCollaborators (
+  ctx: MeasureContext,
   doc: Doc,
   mixin: ClassCollaborators,
   control: TriggerControl
@@ -291,7 +292,11 @@ export async function getDocCollaborators (
   const collaborators = new Set<Ref<Account>>()
   for (const field of mixin.fields) {
     const value = (doc as any)[field]
-    const newCollaborators = await getKeyCollaborators(doc, value, field, control)
+    const newCollaborators = await ctx.with(
+      'getKeyCollaborators',
+      {},
+      async () => await getKeyCollaborators(doc, value, field, control)
+    )
     if (newCollaborators !== undefined) {
       for (const newCollaborator of newCollaborators) {
         collaborators.add(newCollaborator)
@@ -544,9 +549,7 @@ export async function createPushNotification (
   const privateKey = getMetadata(serverNotification.metadata.PushPrivateKey)
   const subject = getMetadata(serverNotification.metadata.PushSubject) ?? 'mailto:hey@huly.io'
   if (privateKey === undefined || publicKey === undefined) return
-  const subscriptions = (await control.queryFind(notification.class.PushSubscription, {})).filter(
-    (p) => p.user === target
-  )
+  const subscriptions = await control.findAll(notification.class.PushSubscription, { user: target })
   const data: PushData = {
     title,
     body
@@ -784,6 +787,7 @@ async function updateContextsTimestamp (
 }
 
 export async function createCollabDocInfo (
+  ctx: MeasureContext,
   collaborators: Ref<PersonAccount>[],
   control: TriggerControl,
   tx: TxCUD<Doc>,
@@ -799,7 +803,7 @@ export async function createCollabDocInfo (
     return res
   }
 
-  const notifyContexts = await control.findAll(notification.class.DocNotifyContext, { attachedTo: object._id })
+  const notifyContexts = await control.findAllCtx(ctx, notification.class.DocNotifyContext, { attachedTo: object._id })
 
   await updateContextsTimestamp(notifyContexts, originTx.modifiedOn, control, originTx.modifiedBy)
 
@@ -822,7 +826,11 @@ export async function createCollabDocInfo (
     return res
   }
 
-  const usersInfo = await getUsersInfo([...Array.from(targets), originTx.modifiedBy as Ref<PersonAccount>], control)
+  const usersInfo = await ctx.with(
+    'get-user-info',
+    {},
+    async (ctx) => await getUsersInfo(ctx, [...Array.from(targets), originTx.modifiedBy as Ref<PersonAccount>], control)
+  )
   const sender = usersInfo.find(({ _id }) => _id === originTx.modifiedBy) ?? {
     _id: originTx.modifiedBy
   }
@@ -888,7 +896,7 @@ async function getSpaceCollabTxes (
     return []
   }
 
-  const space = cache.get(doc.space) ?? (await control.findAll(core.class.Space, { _id: doc.space }))[0]
+  const space = cache.get(doc.space) ?? (await control.findAll(core.class.Space, { _id: doc.space }, { limit: 1 }))[0]
   if (space === undefined) return []
 
   cache.set(space._id, space)
@@ -901,6 +909,7 @@ async function getSpaceCollabTxes (
     const collabs = control.hierarchy.as<Doc, Collaborators>(space, notification.mixin.Collaborators)
     if (collabs.collaborators !== undefined) {
       return await createCollabDocInfo(
+        control.ctx,
         collabs.collaborators as Ref<PersonAccount>[],
         control,
         tx,
@@ -916,6 +925,7 @@ async function getSpaceCollabTxes (
 }
 
 async function createCollaboratorDoc (
+  ctx: MeasureContext,
   tx: TxCreateDoc<Doc>,
   control: TriggerControl,
   activityMessage: ActivityMessage[],
@@ -931,28 +941,45 @@ async function createCollaboratorDoc (
   }
 
   const doc = TxProcessor.createDoc2Doc(tx)
-  const collaborators = await getDocCollaborators(doc, mixin, control)
+  const collaborators = await ctx.with(
+    'get-collaborators',
+    {},
+    async (ctx) => await getDocCollaborators(ctx, doc, mixin, control)
+  )
   const mixinTx = getMixinTx(tx, control, collaborators)
 
-  const notificationTxes = await createCollabDocInfo(
-    collaborators as Ref<PersonAccount>[],
-    control,
-    tx,
-    originTx,
-    doc,
-    activityMessage,
-    { isOwn: true, isSpace: false, shouldUpdateTimestamp: true },
-    cache
+  const notificationTxes = await ctx.with(
+    'create-collabdocinfo',
+    {},
+    async () =>
+      await createCollabDocInfo(
+        ctx,
+        collaborators as Ref<PersonAccount>[],
+        control,
+        tx,
+        originTx,
+        doc,
+        activityMessage,
+        { isOwn: true, isSpace: false, shouldUpdateTimestamp: true },
+        cache
+      )
   )
   res.push(mixinTx)
   res.push(...notificationTxes)
 
-  res.push(...(await getSpaceCollabTxes(control, doc, tx, originTx, activityMessage, cache)))
+  res.push(
+    ...(await ctx.with(
+      'get-space-collabtxes',
+      {},
+      async () => await getSpaceCollabTxes(control, doc, tx, originTx, activityMessage, cache)
+    ))
+  )
 
   return res
 }
 
 async function updateCollaboratorsMixin (
+  ctx: MeasureContext,
   tx: TxMixin<Doc, Collaborators>,
   control: TriggerControl,
   activityMessages: ActivityMessage[],
@@ -969,17 +996,17 @@ async function updateCollaboratorsMixin (
   if (tx.attributes.collaborators !== undefined) {
     const createTx = hierarchy.isDerived(tx.objectClass, core.class.AttachedDoc)
       ? (
-          await control.findAll(core.class.TxCollectionCUD, {
+          await control.findAllCtx(ctx, core.class.TxCollectionCUD, {
             'tx.objectId': tx.objectId,
             'tx._class': core.class.TxCreateDoc
           })
         )[0]
       : (
-          await control.findAll(core.class.TxCreateDoc, {
+          await control.findAllCtx(ctx, core.class.TxCreateDoc, {
             objectId: tx.objectId
           })
         )[0]
-    const mixinTxes = await control.findAll(core.class.TxMixin, {
+    const mixinTxes = await control.findAllCtx(ctx, core.class.TxMixin, {
       objectId: tx.objectId
     })
     const prevDoc = TxProcessor.buildDoc2Doc([createTx, ...mixinTxes].filter((t) => t._id !== tx._id)) as Doc
@@ -992,7 +1019,7 @@ async function updateCollaboratorsMixin (
       prevCollabs = new Set(prevDocMixin.collaborators ?? [])
     } else {
       const mixin = hierarchy.classHierarchyMixin(prevDoc._class, notification.mixin.ClassCollaborators)
-      prevCollabs = mixin !== undefined ? new Set(await getDocCollaborators(prevDoc, mixin, control)) : new Set()
+      prevCollabs = mixin !== undefined ? new Set(await getDocCollaborators(ctx, prevDoc, mixin, control)) : new Set()
     }
 
     const type = await control.modelDb.findOne(notification.class.BaseNotificationType, {
@@ -1017,12 +1044,16 @@ async function updateCollaboratorsMixin (
     }
 
     if (newCollabs.length > 0) {
-      const docNotifyContexts = await control.findAll(notification.class.DocNotifyContext, {
+      const docNotifyContexts = await control.findAllCtx(ctx, notification.class.DocNotifyContext, {
         user: { $in: newCollabs },
         attachedTo: tx.objectId
       })
 
-      const infos = await getUsersInfo([...newCollabs, originTx.modifiedBy] as Ref<PersonAccount>[], control)
+      const infos = await ctx.with(
+        'get-user-info',
+        {},
+        async (ctx) => await getUsersInfo(ctx, [...newCollabs, originTx.modifiedBy] as Ref<PersonAccount>[], control)
+      )
       const sender = infos.find(({ _id }) => _id === originTx.modifiedBy) ?? { _id: originTx.modifiedBy }
 
       for (const collab of newCollabs) {
@@ -1050,13 +1081,14 @@ async function updateCollaboratorsMixin (
 }
 
 async function collectionCollabDoc (
+  ctx: MeasureContext,
   tx: TxCollectionCUD<Doc, AttachedDoc>,
   control: TriggerControl,
   activityMessages: ActivityMessage[],
   cache: Map<Ref<Doc>, Doc>
 ): Promise<Tx[]> {
   const actualTx = TxProcessor.extractTx(tx) as TxCUD<Doc>
-  let res = await createCollaboratorNotifications(control.ctx, actualTx, control, activityMessages, tx, cache)
+  let res = await createCollaboratorNotifications(ctx, actualTx, control, activityMessages, tx, cache)
 
   if (![core.class.TxCreateDoc, core.class.TxRemoveDoc, core.class.TxUpdateDoc].includes(actualTx._class)) {
     return res
@@ -1068,7 +1100,12 @@ async function collectionCollabDoc (
     return res
   }
 
-  const doc = cache.get(tx.objectId) ?? (await control.findAll(tx.objectClass, { _id: tx.objectId }, { limit: 1 }))[0]
+  const doc = await ctx.with(
+    'get-doc',
+    {},
+    async (ctx) =>
+      cache.get(tx.objectId) ?? (await control.findAllCtx(ctx, tx.objectClass, { _id: tx.objectId }, { limit: 1 }))[0]
+  )
 
   if (doc === undefined) {
     return res
@@ -1076,18 +1113,28 @@ async function collectionCollabDoc (
 
   cache.set(doc._id, doc)
 
-  const collaborators = await getCollaborators(doc, control, tx, res)
+  const collaborators = await ctx.with(
+    'get-collaborators',
+    {},
+    async () => await getCollaborators(doc, control, tx, res)
+  )
 
   res = res.concat(
-    await createCollabDocInfo(
-      collaborators as Ref<PersonAccount>[],
-      control,
-      actualTx,
-      tx,
-      doc,
-      activityMessages,
-      { isOwn: false, isSpace: false, shouldUpdateTimestamp: true },
-      cache
+    await ctx.with(
+      'create-collab-doc-info',
+      {},
+      async (ctx) =>
+        await createCollabDocInfo(
+          ctx,
+          collaborators as Ref<PersonAccount>[],
+          control,
+          actualTx,
+          tx,
+          doc,
+          activityMessages,
+          { isOwn: false, isSpace: false, shouldUpdateTimestamp: true },
+          cache
+        )
     )
   )
 
@@ -1184,6 +1231,7 @@ async function getNewCollaborators (
 }
 
 async function updateCollaboratorDoc (
+  ctx: MeasureContext,
   tx: TxUpdateDoc<Doc> | TxMixin<Doc, Doc>,
   control: TriggerControl,
   originTx: TxCUD<Doc>,
@@ -1194,7 +1242,11 @@ async function updateCollaboratorDoc (
   let res: Tx[] = []
   const mixin = hierarchy.classHierarchyMixin(tx.objectClass, notification.mixin.ClassCollaborators)
   if (mixin === undefined) return []
-  const doc = (await control.findAll(tx.objectClass, { _id: tx.objectId }, { limit: 1 }))[0]
+  const doc = await ctx.with(
+    'find-doc',
+    { _class: tx.objectClass },
+    async () => (await control.findAllCtx(ctx, tx.objectClass, { _id: tx.objectId }, { limit: 1 }))[0]
+  )
   if (doc === undefined) return []
   const params: NotifyParams = { isOwn: true, isSpace: false, shouldUpdateTimestamp: true }
   if (hierarchy.hasMixin(doc, notification.mixin.Collaborators)) {
@@ -1202,7 +1254,9 @@ async function updateCollaboratorDoc (
     const collabMixin = hierarchy.as(doc, notification.mixin.Collaborators)
     const collabs = new Set(collabMixin.collaborators)
     const ops = isMixinTx(tx) ? tx.attributes : tx.operations
-    const newCollaborators = (await getNewCollaborators(ops, mixin, doc, control)).filter((p) => !collabs.has(p))
+    const newCollaborators = await ctx.with('get-new-collaborators', {}, async () =>
+      (await getNewCollaborators(ops, mixin, doc, control)).filter((p) => !collabs.has(p))
+    )
 
     if (newCollaborators.length > 0) {
       res.push(
@@ -1217,22 +1271,33 @@ async function updateCollaboratorDoc (
       )
     }
     res = res.concat(
-      await createCollabDocInfo(
-        [...collabMixin.collaborators, ...newCollaborators] as Ref<PersonAccount>[],
-        control,
-        tx,
-        originTx,
-        doc,
-        activityMessages,
-        params,
-        cache
+      await ctx.with(
+        'create-collab-docinfo',
+        {},
+        async () =>
+          await createCollabDocInfo(
+            ctx,
+            [...collabMixin.collaborators, ...newCollaborators] as Ref<PersonAccount>[],
+            control,
+            tx,
+            originTx,
+            doc,
+            activityMessages,
+            params,
+            cache
+          )
       )
     )
   } else {
-    const collaborators = await getDocCollaborators(doc, mixin, control)
+    const collaborators = await ctx.with(
+      'get-doc-collaborators',
+      {},
+      async () => await getDocCollaborators(ctx, doc, mixin, control)
+    )
     res.push(getMixinTx(tx, control, collaborators))
     res = res.concat(
       await createCollabDocInfo(
+        ctx,
         collaborators as Ref<PersonAccount>[],
         control,
         tx,
@@ -1245,8 +1310,16 @@ async function updateCollaboratorDoc (
     )
   }
 
-  res = res.concat(await getSpaceCollabTxes(control, doc, tx, originTx, activityMessages, cache))
-  res = res.concat(await updateNotifyContextsSpace(control, tx))
+  res = res.concat(
+    await ctx.with(
+      'get-space-collabtxes',
+      {},
+      async () => await getSpaceCollabTxes(control, doc, tx, originTx, activityMessages, cache)
+    )
+  )
+  res = res.concat(
+    await ctx.with('update-notify-context-space', {}, async () => await updateNotifyContextsSpace(control, tx))
+  )
 
   return res
 }
@@ -1305,6 +1378,7 @@ export async function OnAttributeUpdate (tx: Tx, control: TriggerControl): Promi
 }
 
 async function applyUserTxes (
+  ctx: MeasureContext,
   control: TriggerControl,
   txes: Tx[],
   cache: Map<Ref<Doc>, Doc> = new Map<Ref<Doc>, Doc>()
@@ -1342,7 +1416,9 @@ async function applyUserTxes (
   }
 
   for (const [user, txs] of map.entries()) {
-    const account = (cache.get(user) as PersonAccount) ?? (await getPersonAccountById(user, control))
+    const account =
+      (cache.get(user) as PersonAccount) ??
+      (await ctx.with('get-person-account', {}, async () => await getPersonAccountById(user, control)))
 
     if (account !== undefined) {
       cache.set(account._id, account)
@@ -1378,21 +1454,47 @@ export async function createCollaboratorNotifications (
 
   switch (tx._class) {
     case core.class.TxCreateDoc: {
-      const res = await createCollaboratorDoc(tx as TxCreateDoc<Doc>, control, activityMessages, originTx ?? tx, cache)
+      const res = await ctx.with(
+        'createCollaboratorDoc',
+        {},
+        async () =>
+          await createCollaboratorDoc(ctx, tx as TxCreateDoc<Doc>, control, activityMessages, originTx ?? tx, cache)
+      )
 
-      return await applyUserTxes(control, res)
+      return await applyUserTxes(ctx, control, res)
     }
     case core.class.TxUpdateDoc:
     case core.class.TxMixin: {
-      let res = await updateCollaboratorDoc(tx as TxUpdateDoc<Doc>, control, originTx ?? tx, activityMessages, cache)
-      res = res.concat(
-        await updateCollaboratorsMixin(tx as TxMixin<Doc, Collaborators>, control, activityMessages, originTx ?? tx)
+      let res = await ctx.with(
+        'updateCollaboratorDoc',
+        {},
+        async () =>
+          await updateCollaboratorDoc(ctx, tx as TxUpdateDoc<Doc>, control, originTx ?? tx, activityMessages, cache)
       )
-      return await applyUserTxes(control, res)
+      res = res.concat(
+        await ctx.with(
+          'updateCollaboratorMixin',
+          {},
+          async () =>
+            await updateCollaboratorsMixin(
+              ctx,
+              tx as TxMixin<Doc, Collaborators>,
+              control,
+              activityMessages,
+              originTx ?? tx
+            )
+        )
+      )
+      return await applyUserTxes(ctx, control, res)
     }
     case core.class.TxCollectionCUD: {
-      const res = await collectionCollabDoc(tx as TxCollectionCUD<Doc, AttachedDoc>, control, activityMessages, cache)
-      return await applyUserTxes(control, res)
+      const res = await ctx.with(
+        'collectionCollabDoc',
+        {},
+        async (ctx) =>
+          await collectionCollabDoc(ctx, tx as TxCollectionCUD<Doc, AttachedDoc>, control, activityMessages, cache)
+      )
+      return await applyUserTxes(ctx, control, res)
     }
   }
 
@@ -1481,7 +1583,7 @@ export async function getCollaborators (
   if (control.hierarchy.hasMixin(doc, notification.mixin.Collaborators)) {
     return control.hierarchy.as(doc, notification.mixin.Collaborators).collaborators
   } else {
-    const collaborators = await getDocCollaborators(doc, mixin, control)
+    const collaborators = await getDocCollaborators(control.ctx, doc, mixin, control)
 
     res.push(getMixinTx(tx, control, collaborators))
     return collaborators
diff --git a/server-plugins/notification-resources/src/utils.ts b/server-plugins/notification-resources/src/utils.ts
index 713e9cce24..42a582c892 100644
--- a/server-plugins/notification-resources/src/utils.ts
+++ b/server-plugins/notification-resources/src/utils.ts
@@ -12,14 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-import notification, {
-  BaseNotificationType,
-  CommonNotificationType,
-  NotificationContent,
-  NotificationProvider,
-  NotificationType
-} from '@hcengineering/notification'
-import type { TriggerControl } from '@hcengineering/server-core'
+import { DocUpdateMessage } from '@hcengineering/activity'
+import { Analytics } from '@hcengineering/analytics'
+import contact, { formatName, PersonAccount } from '@hcengineering/contact'
 import core, {
   Account,
   Class,
@@ -29,14 +24,25 @@ import core, {
   matchQuery,
   MixinUpdate,
   Ref,
+  toIdMap,
   Tx,
   TxCreateDoc,
   TxCUD,
   TxMixin,
   TxProcessor,
   TxRemoveDoc,
-  TxUpdateDoc
+  TxUpdateDoc,
+  type MeasureContext
 } from '@hcengineering/core'
+import notification, {
+  BaseNotificationType,
+  CommonNotificationType,
+  NotificationContent,
+  NotificationProvider,
+  NotificationType
+} from '@hcengineering/notification'
+import { getResource, IntlString, translate } from '@hcengineering/platform'
+import type { TriggerControl } from '@hcengineering/server-core'
 import serverNotification, {
   getPersonAccountById,
   HTMLPresenter,
@@ -44,10 +50,6 @@ import serverNotification, {
   TextPresenter,
   UserInfo
 } from '@hcengineering/server-notification'
-import { getResource, IntlString, translate } from '@hcengineering/platform'
-import contact, { formatName, PersonAccount } from '@hcengineering/contact'
-import { DocUpdateMessage } from '@hcengineering/activity'
-import { Analytics } from '@hcengineering/analytics'
 
 import { NotifyResult } from './types'
 
@@ -134,7 +136,9 @@ export async function isAllowed (
   type: BaseNotificationType,
   provider: NotificationProvider
 ): Promise<boolean> {
-  const providersSettings = await control.queryFind(notification.class.NotificationProviderSetting, {})
+  const providersSettings = await control.queryFind(notification.class.NotificationProviderSetting, {
+    space: core.space.Workspace
+  })
   const providerSetting = providersSettings.find(
     ({ attachedTo, modifiedBy }) => attachedTo === provider._id && modifiedBy === receiver
   )
@@ -446,13 +450,23 @@ export async function getNotificationContent (
   return content
 }
 
-export async function getUsersInfo (ids: Ref<PersonAccount>[], control: TriggerControl): Promise<UserInfo[]> {
+export async function getUsersInfo (
+  ctx: MeasureContext,
+  ids: Ref<PersonAccount>[],
+  control: TriggerControl
+): Promise<UserInfo[]> {
   const accounts = await control.modelDb.findAll(contact.class.PersonAccount, { _id: { $in: ids } })
-  const persons = await control.queryFind(contact.class.Person, {})
+  const persons = toIdMap(
+    await ctx.with(
+      'query-find',
+      {},
+      async () => await control.findAll(contact.class.Person, { _id: { $in: accounts.map((it) => it.person) } })
+    )
+  )
 
   return accounts.map((account) => ({
     _id: account._id,
     account,
-    person: persons.find(({ _id }) => _id === account.person)
+    person: persons.get(account.person)
   }))
 }
diff --git a/server-plugins/request-resources/src/index.ts b/server-plugins/request-resources/src/index.ts
index 9e057f86bb..94e5c64bc0 100644
--- a/server-plugins/request-resources/src/index.ts
+++ b/server-plugins/request-resources/src/index.ts
@@ -146,7 +146,7 @@ async function getRequestNotificationTx (tx: TxCollectionCUD<Doc, Request>, cont
   const notifyContexts = await control.findAll(notification.class.DocNotifyContext, {
     attachedTo: doc._id
   })
-  const usersInfo = await getUsersInfo([...collaborators, tx.modifiedBy] as Ref<PersonAccount>[], control)
+  const usersInfo = await getUsersInfo(control.ctx, [...collaborators, tx.modifiedBy] as Ref<PersonAccount>[], control)
   const senderInfo = usersInfo.find(({ _id }) => _id === tx.modifiedBy) ?? {
     _id: tx.modifiedBy
   }
diff --git a/server-plugins/view-resources/src/index.ts b/server-plugins/view-resources/src/index.ts
index 51c30800a5..04dd185a2f 100644
--- a/server-plugins/view-resources/src/index.ts
+++ b/server-plugins/view-resources/src/index.ts
@@ -27,7 +27,10 @@ export async function OnCustomAttributeRemove (tx: Tx, control: TriggerControl):
   const txes = await control.findAll<TxCUD<AnyAttribute>>(core.class.TxCUD, { objectId: ptx.objectId })
   const attribute = TxProcessor.buildDoc2Doc<AnyAttribute>(txes)
   if (attribute === undefined) return []
-  const preferences = await control.findAll(view.class.ViewletPreference, { config: attribute.name })
+  const preferences = await control.findAll(view.class.ViewletPreference, {
+    config: attribute.name,
+    space: core.space.Workspace
+  })
   const res: Tx[] = []
   for (const preference of preferences) {
     const tx = control.txFactory.createTxUpdateDoc(preference._class, preference.space, preference._id, {
diff --git a/server/core/src/__tests__/aggregator.spec.ts b/server/core/src/__tests__/aggregator.spec.ts
index 620ae62eae..a190a6c8d0 100644
--- a/server/core/src/__tests__/aggregator.spec.ts
+++ b/server/core/src/__tests__/aggregator.spec.ts
@@ -12,7 +12,6 @@ describe('aggregator tests', () => {
     ws1: WorkspaceId
   } {
     const mem1 = new MemStorageAdapter()
-    mem1.contentTypes = ['application/ydoc']
 
     const mem2 = new MemStorageAdapter()
     const adapters = new Map<string, StorageAdapter>()
@@ -25,19 +24,6 @@ describe('aggregator tests', () => {
     const ws1: WorkspaceId = { name: 'ws1', productId: '' }
     return { mem1, mem2, aggr, ws1, testCtx }
   }
-  it('choose a proper storage', async () => {
-    const { aggr, ws1, testCtx } = prepare1()
-
-    // Test default provider
-    await aggr.put(testCtx, ws1, 'test', 'data', 'text/plain')
-    const stat = await aggr.stat(testCtx, ws1, 'test')
-    expect(stat?.provider).toEqual('mem2')
-
-    // Test content typed provider
-    await aggr.put(testCtx, ws1, 'test2', 'data', 'application/ydoc')
-    const stat2 = await aggr.stat(testCtx, ws1, 'test2')
-    expect(stat2?.provider).toEqual('mem1')
-  })
   it('reuse existing storage', async () => {
     const { mem1, aggr, ws1, testCtx } = prepare1()
 
diff --git a/server/core/src/__tests__/memAdapters.ts b/server/core/src/__tests__/memAdapters.ts
index 46fdcaeb04..58682f80f8 100644
--- a/server/core/src/__tests__/memAdapters.ts
+++ b/server/core/src/__tests__/memAdapters.ts
@@ -3,9 +3,7 @@ import core, {
   ModelDb,
   TxProcessor,
   toFindResult,
-  type Branding,
   type Blob,
-  type BlobLookup,
   type Class,
   type Doc,
   type DocumentQuery,
@@ -15,22 +13,14 @@ import core, {
   type FindResult,
   type MeasureContext,
   type Ref,
-  type WorkspaceId,
-  type WorkspaceIdWithUrl
+  type WorkspaceId
 } from '@hcengineering/core'
 import { genMinModel } from '@hcengineering/core/src/__tests__/minmodel'
-import type {
-  BlobLookupResult,
-  BlobStorageIterator,
-  BucketInfo,
-  StorageAdapter,
-  UploadedObjectInfo
-} from '@hcengineering/storage'
+import type { BlobStorageIterator, BucketInfo, StorageAdapter, UploadedObjectInfo } from '@hcengineering/storage'
 import { Readable } from 'stream'
 import type { RawDBAdapter, RawDBAdapterStream } from '../adapter'
 
 export class MemStorageAdapter implements StorageAdapter {
-  contentTypes?: string[] | undefined
   files = new Map<string, Blob & { content: Buffer, workspace: string }>()
 
   async initialize (ctx: MeasureContext, workspaceId: WorkspaceId): Promise<void> {}
@@ -157,15 +147,6 @@ export class MemStorageAdapter implements StorageAdapter {
     // Partial are not supported by
     throw new Error('NoSuchKey')
   }
-
-  async lookup (
-    ctx: MeasureContext,
-    workspaceId: WorkspaceIdWithUrl,
-    branding: Branding | null,
-    docs: Blob[]
-  ): Promise<BlobLookupResult> {
-    return { lookups: docs as unknown as BlobLookup[] }
-  }
 }
 
 export class MemRawDBAdapter implements RawDBAdapter {
diff --git a/server/core/src/server/aggregator.ts b/server/core/src/server/aggregator.ts
index c3352ccc68..6ceee9a073 100644
--- a/server/core/src/server/aggregator.ts
+++ b/server/core/src/server/aggregator.ts
@@ -4,19 +4,15 @@ import core, {
   toIdMap,
   withContext,
   type Blob,
-  type BlobLookup,
-  type Branding,
   type MeasureContext,
   type Ref,
   type StorageIterator,
-  type WorkspaceId,
-  type WorkspaceIdWithUrl
+  type WorkspaceId
 } from '@hcengineering/core'
 import { type Readable } from 'stream'
 import { type RawDBAdapter } from '../adapter'
 
 import {
-  type BlobLookupResult,
   type BlobStorageIterator,
   type BucketInfo,
   type ListBlobResult,
@@ -308,16 +304,6 @@ export class AggregatorStorageAdapter implements StorageAdapter, StorageAdapterE
         provider: forceProvider
       }
     }
-    // try select provider based on content type matching.
-    for (const [provider, adapter] of this.adapters.entries()) {
-      if (adapter.contentTypes === undefined) {
-        continue
-      }
-      if (adapter.contentTypes.some((it) => contentType.includes(it))) {
-        // we have matched content type for adapter.
-        return { adapter, provider }
-      }
-    }
 
     return { adapter: this.adapters.get(this.defaultAdapter) as StorageAdapter, provider: this.defaultAdapter }
   }
@@ -367,31 +353,6 @@ export class AggregatorStorageAdapter implements StorageAdapter, StorageAdapterE
     await this.dbAdapter.upload<Blob>(ctx, workspaceId, DOMAIN_BLOB, [blobDoc])
     return result
   }
-
-  @withContext('aggregator-lookup', {})
-  async lookup (
-    ctx: MeasureContext,
-    workspaceId: WorkspaceIdWithUrl,
-    branding: Branding | null,
-    docs: Blob[]
-  ): Promise<BlobLookupResult> {
-    const result: BlobLookup[] = []
-
-    const byProvider = groupByArray(docs, (it) => it.provider)
-    for (const [k, v] of byProvider.entries()) {
-      const provider = this.adapters.get(k)
-      if (provider?.lookup !== undefined) {
-        const upd = await provider.lookup(ctx, workspaceId, branding, v)
-        if (upd.updates !== undefined) {
-          await this.dbAdapter.update(ctx, workspaceId, DOMAIN_BLOB, upd.updates)
-        }
-        result.push(...upd.lookups)
-      }
-    }
-    // Check if we need to perform diff update for blobs
-
-    return { lookups: result }
-  }
 }
 
 /**
diff --git a/server/core/src/types.ts b/server/core/src/types.ts
index b9c50b6dac..99f4ebc2d6 100644
--- a/server/core/src/types.ts
+++ b/server/core/src/types.ts
@@ -484,8 +484,6 @@ export interface StorageConfig {
   kind: string
   endpoint: string
   port?: number
-
-  contentTypes?: string[]
 }
 
 export interface StorageConfiguration {
diff --git a/server/front/readme.md b/server/front/readme.md
index 95027189ec..1675f01356 100644
--- a/server/front/readme.md
+++ b/server/front/readme.md
@@ -32,7 +32,7 @@ A `;` separated list of triples, providerName|previewUrl|supportedFormats.
 - supportedFormats - a `,` separated list of file extensions.
 - contentTypes - a ',' separated list of content type patterns.
 
-PREVIEW_CONFIG=*|https://front.hc.engineering/files/:workspace/api/preview/?width=:size&image=:downloadFile
+PREVIEW_CONFIG=https://front.hc.engineering/files/:workspace/api/preview/?width=:size&image=:downloadFile
 
 ## Variables
 
diff --git a/server/middleware/src/blobs.ts b/server/middleware/src/blobs.ts
deleted file mode 100644
index c5779e8e98..0000000000
--- a/server/middleware/src/blobs.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright © 2022 Hardcore Engineering Inc.
-//
-// Licensed under the Eclipse Public License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License. You may
-// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import core, {
-  Class,
-  Doc,
-  DocumentQuery,
-  FindOptions,
-  FindResult,
-  MeasureContext,
-  Ref,
-  Tx,
-  toFindResult,
-  toIdMap,
-  type Blob,
-  type BlobLookup,
-  type WorkspaceIdWithUrl,
-  type Branding
-} from '@hcengineering/core'
-import { Middleware, SessionContext, TxMiddlewareResult, type ServerStorage } from '@hcengineering/server-core'
-import { BaseMiddleware } from './base'
-
-/**
- * @public
- */
-export class BlobLookupMiddleware extends BaseMiddleware implements Middleware {
-  private constructor (storage: ServerStorage, next?: Middleware) {
-    super(storage, next)
-  }
-
-  static async create (ctx: MeasureContext, storage: ServerStorage, next?: Middleware): Promise<BlobLookupMiddleware> {
-    return new BlobLookupMiddleware(storage, next)
-  }
-
-  async tx (ctx: SessionContext, tx: Tx): Promise<TxMiddlewareResult> {
-    return await this.provideTx(ctx, tx)
-  }
-
-  async fetchBlobInfo (
-    ctx: MeasureContext,
-    workspace: WorkspaceIdWithUrl,
-    branding: Branding | null,
-    toUpdate: [Doc, Blob, string][]
-  ): Promise<void> {
-    if (this.storage.storageAdapter.lookup !== undefined) {
-      const docsToUpdate = toUpdate.map((it) => it[1])
-      const updatedBlobs = toIdMap<Blob>(
-        (await this.storage.storageAdapter.lookup(ctx, workspace, branding, docsToUpdate)).lookups
-      )
-      for (const [doc, blob, key] of toUpdate) {
-        const ublob = updatedBlobs.get(blob._id)
-        if (ublob !== undefined) {
-          ;(doc as any).$lookup[key] = ublob
-        }
-      }
-    }
-  }
-
-  override async findAll<T extends Doc>(
-    ctx: SessionContext,
-    _class: Ref<Class<T>>,
-    query: DocumentQuery<T>,
-    options?: FindOptions<T>
-  ): Promise<FindResult<T>> {
-    const result = await this.provideFindAll(ctx, _class, query, options)
-    // Fill lookup map to make more compact representation
-
-    if (_class === core.class.Blob) {
-      // Bulk update of info
-      const updatedBlobs = toIdMap<Blob>(
-        (await this.storage.storageAdapter.lookup(ctx.ctx, ctx.workspace, ctx.branding, result as unknown as Blob[]))
-          .lookups
-      )
-      const res: T[] = []
-      for (const d of result) {
-        res.push((updatedBlobs.get(d._id as unknown as Ref<BlobLookup>) ?? d) as T)
-      }
-      return toFindResult(res, result.total, result.lookupMap)
-    }
-
-    if (options?.lookup !== undefined && this.storage.storageAdapter.lookup !== undefined) {
-      // Check if $lookups has core.class.Blob as object, and we need to enhance them
-
-      let toUpdate: [Doc, Blob, string][] = []
-
-      for (const d of result) {
-        if (d.$lookup !== undefined) {
-          for (const [k, v] of Object.entries(d.$lookup)) {
-            if (v !== undefined && !Array.isArray(v) && v._class === core.class.Blob) {
-              toUpdate.push([d, v, k])
-            }
-          }
-        }
-        if (toUpdate.length > 50) {
-          // Bulk update of info
-          await this.fetchBlobInfo(ctx.ctx, ctx.workspace, ctx.branding, toUpdate)
-          toUpdate = []
-        }
-      }
-      if (toUpdate.length > 0) {
-        // Bulk update of info
-        await this.fetchBlobInfo(ctx.ctx, ctx.workspace, ctx.branding, toUpdate)
-        toUpdate = []
-      }
-    }
-    return result
-  }
-}
diff --git a/server/middleware/src/index.ts b/server/middleware/src/index.ts
index 97059e6907..747fb311d0 100644
--- a/server/middleware/src/index.ts
+++ b/server/middleware/src/index.ts
@@ -21,4 +21,3 @@ export * from './queryJoin'
 export * from './spaceSecurity'
 export * from './spacePermissions'
 export * from './lookup'
-export * from './blobs'
diff --git a/server/minio/src/index.ts b/server/minio/src/index.ts
index 0de45c9742..a0e22b78f3 100644
--- a/server/minio/src/index.ts
+++ b/server/minio/src/index.ts
@@ -16,22 +16,16 @@
 import { Client, type BucketItem, type BucketStream } from 'minio'
 
 import core, {
-  concatLink,
   toWorkspaceString,
   withContext,
   type Blob,
-  type BlobLookup,
   type MeasureContext,
   type Ref,
-  type WorkspaceId,
-  type WorkspaceIdWithUrl,
-  type Branding
+  type WorkspaceId
 } from '@hcengineering/core'
 
-import { getMetadata } from '@hcengineering/platform'
-import serverCore, {
+import {
   removeAllObjects,
-  type BlobLookupResult,
   type BlobStorageIterator,
   type BucketInfo,
   type ListBlobResult,
@@ -62,7 +56,6 @@ export interface MinioConfig extends StorageConfig {
 export class MinioService implements StorageAdapter {
   static config = 'minio'
   client: Client
-  contentTypes?: string[]
   constructor (readonly opt: MinioConfig) {
     this.client = new Client({
       endPoint: opt.endpoint,
@@ -72,26 +65,10 @@ export class MinioService implements StorageAdapter {
       port: opt.port ?? 9000,
       useSSL: opt.useSSL === 'true'
     })
-    this.contentTypes = opt.contentTypes
   }
 
   async initialize (ctx: MeasureContext, workspaceId: WorkspaceId): Promise<void> {}
 
-  async lookup (
-    ctx: MeasureContext,
-    workspaceId: WorkspaceIdWithUrl,
-    branding: Branding | null,
-    docs: Blob[]
-  ): Promise<BlobLookupResult> {
-    const frontUrl = branding?.front ?? getMetadata(serverCore.metadata.FrontUrl) ?? ''
-    for (const d of docs) {
-      // Let's add current from URI for previews.
-      const bl = d as BlobLookup
-      bl.downloadUrl = concatLink(frontUrl, `/files/${workspaceId.workspaceUrl}?file=${d._id}`)
-    }
-    return { lookups: docs as BlobLookup[] }
-  }
-
   /**
    * @public
    */
diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts
index 5554436b05..c1ee4ec32c 100644
--- a/server/mongo/src/storage.ts
+++ b/server/mongo/src/storage.ts
@@ -128,11 +128,10 @@ export interface DbAdapterOptions {
 abstract class MongoAdapterBase implements DbAdapter {
   _db: DBCollectionHelper
 
-  findRateLimit = new RateLimiter(parseInt(process.env.FIND_RLIMIT ?? '10'))
-  rateLimit = new RateLimiter(parseInt(process.env.TX_RLIMIT ?? '1'))
+  findRateLimit = new RateLimiter(parseInt(process.env.FIND_RLIMIT ?? '1000'))
+  rateLimit = new RateLimiter(parseInt(process.env.TX_RLIMIT ?? '5'))
 
   constructor (
-    readonly globalCtx: MeasureContext,
     protected readonly db: Db,
     protected readonly hierarchy: Hierarchy,
     protected readonly modelDb: ModelDb,
@@ -216,14 +215,14 @@ abstract class MongoAdapterBase implements DbAdapter {
     }
     const baseClass = this.hierarchy.getBaseClass(clazz)
     if (baseClass !== core.class.Doc) {
-      const classes = this.hierarchy.getDescendants(baseClass)
+      const classes = this.hierarchy.getDescendants(baseClass).filter((it) => !this.hierarchy.isMixin(it))
 
       // Only replace if not specified
       if (translated._class === undefined) {
         translated._class = { $in: classes }
       } else if (typeof translated._class === 'string') {
         if (!classes.includes(translated._class)) {
-          translated._class = { $in: classes.filter((it) => !this.hierarchy.isMixin(it)) }
+          translated._class = classes.length === 1 ? classes[0] : { $in: classes }
         }
       } else if (typeof translated._class === 'object' && translated._class !== null) {
         let descendants: Ref<Class<Doc>>[] = classes
@@ -238,7 +237,8 @@ abstract class MongoAdapterBase implements DbAdapter {
           descendants = descendants.filter((c) => !excludedClassesIds.has(c))
         }
 
-        translated._class = { $in: descendants.filter((it: any) => !this.hierarchy.isMixin(it as Ref<Class<Doc>>)) }
+        const desc = descendants.filter((it: any) => !this.hierarchy.isMixin(it as Ref<Class<Doc>>))
+        translated._class = desc.length === 1 ? desc[0] : { $in: desc }
       }
 
       if (baseClass !== clazz) {
@@ -279,8 +279,7 @@ abstract class MongoAdapterBase implements DbAdapter {
             from: domain,
             localField: fullKey,
             foreignField: '_id',
-            as: fullKey.split('.').join('') + '_lookup',
-            pipeline: [{ $project: { '%hash%': 0 } }]
+            as: fullKey.split('.').join('') + '_lookup'
           })
         }
         await this.getLookupValue(_class, nested, result, fullKey + '_lookup')
@@ -294,8 +293,7 @@ abstract class MongoAdapterBase implements DbAdapter {
             from: domain,
             localField: fullKey,
             foreignField: '_id',
-            as: fullKey.split('.').join('') + '_lookup',
-            pipeline: [{ $project: { '%hash%': 0 } }]
+            as: fullKey.split('.').join('') + '_lookup'
           })
         }
       }
@@ -333,10 +331,9 @@ abstract class MongoAdapterBase implements DbAdapter {
           pipeline: [
             {
               $match: {
-                _class: { $in: desc }
+                _class: desc.length === 1 ? desc[0] : { $in: desc }
               }
-            },
-            { $project: { '%hash%': 0 } }
+            }
           ],
           as: asVal
         }
@@ -483,7 +480,7 @@ abstract class MongoAdapterBase implements DbAdapter {
     const pipeline: any[] = []
     const match = { $match: this.translateQuery(clazz, query) }
     const slowPipeline = isLookupQuery(query) || isLookupSort(options?.sort)
-    const steps = await this.getLookups(clazz, options?.lookup)
+    const steps = await ctx.with('get-lookups', {}, async () => await this.getLookups(clazz, options?.lookup))
     if (slowPipeline) {
       for (const step of steps) {
         pipeline.push({ $lookup: step })
@@ -507,8 +504,6 @@ abstract class MongoAdapterBase implements DbAdapter {
         projection[ckey] = options.projection[key]
       }
       pipeline.push({ $project: projection })
-    } else {
-      pipeline.push({ $project: { '%hash%': 0 } })
     }
 
     // const domain = this.hierarchy.getDomain(clazz)
@@ -519,15 +514,16 @@ abstract class MongoAdapterBase implements DbAdapter {
     let total = options?.total === true ? 0 : -1
     try {
       await ctx.with(
-        'toArray',
-        {},
+        'aggregate',
+        { clazz },
         async (ctx) => {
           result = await toArray(cursor)
         },
         () => ({
           size: result.length,
           domain,
-          pipeline
+          pipeline,
+          clazz
         })
       )
     } catch (e) {
@@ -538,6 +534,11 @@ abstract class MongoAdapterBase implements DbAdapter {
       await ctx.with('fill-lookup', {}, async (ctx) => {
         await this.fillLookupValue(ctx, clazz, options?.lookup, row)
       })
+      if (row.$lookup !== undefined) {
+        for (const [, v] of Object.entries(row.$lookup)) {
+          this.stripHash(v)
+        }
+      }
       this.clearExtraLookups(row)
     }
     if (options?.total === true) {
@@ -545,10 +546,19 @@ abstract class MongoAdapterBase implements DbAdapter {
       const totalCursor = this.collection(domain).aggregate(totalPipeline, {
         checkKeys: false
       })
-      const arr = await toArray(totalCursor)
+      const arr = await ctx.with(
+        'aggregate-total',
+        {},
+        async (ctx) => await toArray(totalCursor),
+        () => ({
+          domain,
+          pipeline,
+          clazz
+        })
+      )
       total = arr?.[0]?.total ?? 0
     }
-    return toFindResult(this.stripHash(result), total)
+    return toFindResult(this.stripHash(result) as T[], total)
   }
 
   private translateKey<T extends Doc>(key: string, clazz: Ref<Class<T>>): string {
@@ -634,7 +644,7 @@ abstract class MongoAdapterBase implements DbAdapter {
 
   @withContext('groupBy')
   async groupBy<T>(ctx: MeasureContext, domain: Domain, field: string): Promise<Set<T>> {
-    const result = await this.globalCtx.with(
+    const result = await ctx.with(
       'groupBy',
       { domain },
       async (ctx) => {
@@ -697,7 +707,6 @@ abstract class MongoAdapterBase implements DbAdapter {
     return result
   }
 
-  @withContext('find-all')
   async findAll<T extends Doc>(
     ctx: MeasureContext,
     _class: Ref<Class<T>>,
@@ -708,26 +717,17 @@ abstract class MongoAdapterBase implements DbAdapter {
     return await this.findRateLimit.exec(async () => {
       const st = Date.now()
       const result = await this.collectOps(
-        this.globalCtx,
+        ctx,
         this.hierarchy.findDomain(_class),
         'find',
         async (ctx) => {
+          const domain = options?.domain ?? this.hierarchy.getDomain(_class)
           if (
             options != null &&
             (options?.lookup != null || this.isEnumSort(_class, options) || this.isRulesSort(options))
           ) {
-            return await ctx.with(
-              'pipeline',
-              {},
-              async (ctx) => await this.findWithPipeline(ctx, _class, query, options),
-              {
-                _class,
-                query,
-                options
-              }
-            )
+            return await this.findWithPipeline(ctx, _class, query, options)
           }
-          const domain = options?.domain ?? this.hierarchy.getDomain(_class)
           const coll = this.collection(domain)
           const mongoQuery = this.translateQuery(_class, query)
 
@@ -735,7 +735,7 @@ abstract class MongoAdapterBase implements DbAdapter {
             // Skip sort/projection/etc.
             return await ctx.with(
               'find-one',
-              {},
+              { domain },
               async (ctx) => {
                 const findOptions: MongoFindOptions = {}
 
@@ -744,8 +744,6 @@ abstract class MongoAdapterBase implements DbAdapter {
                 }
                 if (options?.projection !== undefined) {
                   findOptions.projection = this.calcProjection<T>(options, _class)
-                } else {
-                  findOptions.projection = { '%hash%': 0 }
                 }
 
                 const doc = await coll.findOne(mongoQuery, findOptions)
@@ -758,7 +756,7 @@ abstract class MongoAdapterBase implements DbAdapter {
                 }
                 return toFindResult([], total)
               },
-              { mongoQuery }
+              { domain, mongoQuery }
             )
           }
 
@@ -769,8 +767,6 @@ abstract class MongoAdapterBase implements DbAdapter {
             if (projection != null) {
               cursor = cursor.project(projection)
             }
-          } else {
-            cursor = cursor.project({ '%hash%': 0 })
           }
           let total: number = -1
           if (options != null) {
@@ -792,7 +788,7 @@ abstract class MongoAdapterBase implements DbAdapter {
           try {
             let res: T[] = []
             await ctx.with(
-              'toArray',
+              'find-all',
               {},
               async (ctx) => {
                 res = await toArray(cursor)
@@ -807,7 +803,7 @@ abstract class MongoAdapterBase implements DbAdapter {
             if (options?.total === true && options?.limit === undefined) {
               total = res.length
             }
-            return toFindResult(this.stripHash(res), total)
+            return toFindResult(this.stripHash(res) as T[], total)
           } catch (e) {
             console.error('error during executing cursor in findAll', _class, cutObjectArray(query), options, e)
             throw e
@@ -882,13 +878,19 @@ abstract class MongoAdapterBase implements DbAdapter {
     return projection
   }
 
-  stripHash<T extends Doc>(docs: T[]): T[] {
-    docs.forEach((it) => {
-      if ('%hash%' in it) {
-        delete it['%hash%']
+  stripHash<T extends Doc>(docs: T | T[]): T | T[] {
+    if (Array.isArray(docs)) {
+      docs.forEach((it) => {
+        if ('%hash%' in it) {
+          delete it['%hash%']
+        }
+        return it
+      })
+    } else if (typeof docs === 'object' && docs != null) {
+      if ('%hash%' in docs) {
+        delete docs['%hash%']
       }
-      return it
-    })
+    }
     return docs
   }
 
@@ -1000,7 +1002,7 @@ abstract class MongoAdapterBase implements DbAdapter {
       }
       const cursor = this.db.collection<Doc>(domain).find<Doc>({ _id: { $in: docs } }, { limit: docs.length })
       const result = await toArray(cursor)
-      return this.stripHash(result)
+      return this.stripHash(result) as Doc[]
     })
   }
 
@@ -1108,7 +1110,6 @@ class MongoAdapter extends MongoAdapterBase {
     }
   }
 
-  @withContext('tx')
   async tx (ctx: MeasureContext, ...txes: Tx[]): Promise<TxResult[]> {
     const result: TxResult[] = []
 
@@ -1147,7 +1148,7 @@ class MongoAdapter extends MongoAdapterBase {
         }
         domains.push(
           this.collectOps(
-            this.globalCtx,
+            ctx,
             domain,
             'tx',
             async (ctx) => {
@@ -1454,13 +1455,12 @@ class MongoTxAdapter extends MongoAdapterBase implements TxAdapter {
     await this._db.init(DOMAIN_TX)
   }
 
-  @withContext('tx')
   override async tx (ctx: MeasureContext, ...tx: Tx[]): Promise<TxResult[]> {
     if (tx.length === 0) {
       return []
     }
     await this.collectOps(
-      this.globalCtx,
+      ctx,
       DOMAIN_TX,
       'tx',
       async () => {
@@ -1490,9 +1490,6 @@ class MongoTxAdapter extends MongoAdapterBase implements TxAdapter {
           sort: {
             _id: 1,
             modifiedOn: 1
-          },
-          projection: {
-            '%hash%': 0
           }
         }
       )
@@ -1650,7 +1647,7 @@ export async function createMongoAdapter (
   const client = getMongoClient(url)
   const db = getWorkspaceDB(await client.getClient(), workspaceId)
 
-  return new MongoAdapter(ctx.newChild('mongoDb', {}), db, hierarchy, modelDb, client, options)
+  return new MongoAdapter(db, hierarchy, modelDb, client, options)
 }
 
 /**
@@ -1666,5 +1663,5 @@ export async function createMongoTxAdapter (
   const client = getMongoClient(url)
   const db = getWorkspaceDB(await client.getClient(), workspaceId)
 
-  return new MongoTxAdapter(ctx.newChild('mongoDbTx', {}), db, hierarchy, modelDb, client)
+  return new MongoTxAdapter(db, hierarchy, modelDb, client)
 }
diff --git a/server/mongo/src/utils.ts b/server/mongo/src/utils.ts
index 6d5f7f0e2b..4410a07f45 100644
--- a/server/mongo/src/utils.ts
+++ b/server/mongo/src/utils.ts
@@ -131,7 +131,8 @@ export function getMongoClient (uri: string, options?: MongoClientOptions): Mong
       MongoClient.connect(uri, {
         appName: 'transactor',
         ...options,
-        ...extraOptions
+        ...extraOptions,
+        enableUtf8Validation: false
       }),
       () => {
         connections.delete(key)
diff --git a/server/s3/src/index.ts b/server/s3/src/index.ts
index 560da53538..deeabfc806 100644
--- a/server/s3/src/index.ts
+++ b/server/s3/src/index.ts
@@ -13,20 +13,16 @@
 // limitations under the License.
 //
 
-import { CopyObjectCommand, GetObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3'
+import { CopyObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3'
 import { Upload } from '@aws-sdk/lib-storage'
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 
 import core, {
   toWorkspaceString,
   withContext,
   type Blob,
-  type BlobLookup,
-  type Branding,
   type MeasureContext,
   type Ref,
-  type WorkspaceId,
-  type WorkspaceIdWithUrl
+  type WorkspaceId
 } from '@hcengineering/core'
 
 import {
@@ -39,7 +35,7 @@ import {
 } from '@hcengineering/server-core'
 import { Readable } from 'stream'
 
-import { removeAllObjects, type BlobLookupResult, type BucketInfo } from '@hcengineering/storage'
+import { removeAllObjects, type BucketInfo } from '@hcengineering/storage'
 import type { ReadableStream } from 'stream/web'
 
 export interface S3Config extends StorageConfig {
@@ -67,7 +63,6 @@ export class S3Service implements StorageAdapter {
   static config = 's3'
   expireTime: number
   client: S3
-  contentTypes?: string[]
   constructor (readonly opt: S3Config) {
     this.client = new S3({
       endpoint: opt.endpoint,
@@ -79,50 +74,10 @@ export class S3Service implements StorageAdapter {
     })
 
     this.expireTime = parseInt(this.opt.expireTime ?? '168') * 3600 // use 7 * 24 - hours as default value for expireF
-    this.contentTypes = opt.contentTypes
   }
 
   async initialize (ctx: MeasureContext, workspaceId: WorkspaceId): Promise<void> {}
 
-  async lookup (
-    ctx: MeasureContext,
-    workspaceId: WorkspaceIdWithUrl,
-    branding: Branding | null,
-    docs: Blob[]
-  ): Promise<BlobLookupResult> {
-    const result: BlobLookupResult = {
-      lookups: [],
-      updates: new Map()
-    }
-    const now = Date.now()
-    for (const d of docs) {
-      // Let's add current from URI for previews.
-      const bl = d as BlobLookup
-      const command = new GetObjectCommand({
-        Bucket: this.getBucketId(workspaceId),
-        Key: this.getDocumentKey(workspaceId, d.storageId),
-        ResponseCacheControl: 'max-age=9d'
-      })
-      if (
-        (bl.downloadUrl === undefined || (bl.downloadUrlExpire ?? 0) < now) &&
-        (this.opt.allowPresign ?? 'true') === 'true'
-      ) {
-        bl.downloadUrl = await getSignedUrl(this.client, command, {
-          expiresIn: this.expireTime
-        })
-        bl.downloadUrlExpire = now + this.expireTime * 1000
-        result.updates?.set(bl._id, {
-          downloadUrl: bl.downloadUrl,
-          downloadUrlExpire: bl.downloadUrlExpire
-        })
-      }
-
-      result.lookups.push(bl)
-    }
-    // this.client.presignedUrl(httpMethod, bucketName, objectName, callback)
-    return result
-  }
-
   /**
    * @public
    */
diff --git a/server/server-pipeline/src/pipeline.ts b/server/server-pipeline/src/pipeline.ts
index ac2e317273..6c2aab069b 100644
--- a/server/server-pipeline/src/pipeline.ts
+++ b/server/server-pipeline/src/pipeline.ts
@@ -10,7 +10,6 @@ import {
 } from '@hcengineering/core'
 import { createElasticAdapter, createElasticBackupDataAdapter } from '@hcengineering/elastic'
 import {
-  BlobLookupMiddleware,
   ConfigurationMiddleware,
   LookupMiddleware,
   ModifiedMiddleware,
@@ -58,7 +57,6 @@ export function createServerPipeline (
 ): PipelineFactory {
   const middlewares: MiddlewareCreator[] = [
     LookupMiddleware.create,
-    BlobLookupMiddleware.create,
     ModifiedMiddleware.create,
     PrivateMiddleware.create,
     SpaceSecurityMiddleware.create,
diff --git a/server/server-storage/src/starter.ts b/server/server-storage/src/starter.ts
index 8c4a9f1396..83ca52ee28 100644
--- a/server/server-storage/src/starter.ts
+++ b/server/server-storage/src/starter.ts
@@ -50,7 +50,7 @@ export function parseStorageEnv (storageEnv: string, storageConfig: StorageConfi
     if (st.trim().length === 0 || !st.includes('|')) {
       throw new Error('Invalid storage config:' + st)
     }
-    let [kindName, url, contentTypes] = st.split('|')
+    let [kindName, url] = st.split('|')
     let [kind, name] = kindName.split(',')
     if (name == null) {
       name = kind
@@ -66,8 +66,7 @@ export function parseStorageEnv (storageEnv: string, storageConfig: StorageConfi
       kind,
       name,
       endpoint: (hasProtocol ? uri.protocol + '//' : '') + uri.hostname, // Port should go away
-      port: uri.port !== '' ? parseInt(uri.port) : undefined,
-      contentTypes: contentTypes !== undefined ? contentTypes.split(',') : undefined
+      port: uri.port !== '' ? parseInt(uri.port) : undefined
     }
 
     // Add all extra parameters
diff --git a/server/server-storage/src/tests/testConfig.spec.ts b/server/server-storage/src/tests/testConfig.spec.ts
index 39755cd6ec..e3474fdbea 100644
--- a/server/server-storage/src/tests/testConfig.spec.ts
+++ b/server/server-storage/src/tests/testConfig.spec.ts
@@ -57,19 +57,4 @@ describe('config-parse', () => {
     expect(minio.secretKey).toEqual('minio2')
     expect((minio as any).downloadUrl).toEqual('https://front.hc.engineering')
   })
-  it('test-decode unexpected symbols', async () => {
-    const cfg: StorageConfiguration = { default: '', storages: [] }
-    parseStorageEnv(
-      'minio|localhost:9000?accessKey=%F0%9F%91%85%F0%9F%91%BB%20-%20%D0%AD%D0%A2%D0%9E%20%20%20%20%D1%82%D0%B0%D0%BA%D0%BE%D0%B9%20%D0%BF%D0%B0%D1%80%D0%BE%D0%BB%D1%8C%0A%D0%90%20%D1%82%D0%BE&secretKey=minio2&downloadUrl=https%3A%2F%2Ffront.hc.engineering|image/jpeg,image/gif',
-      cfg
-    )
-    expect(cfg.default).toEqual('minio')
-    const minio = cfg.storages[0] as MinioConfig
-    expect(minio.endpoint).toEqual('localhost')
-    expect(minio.port).toEqual(9000)
-    expect(minio.accessKey).toEqual('👅👻 - ЭТО    такой пароль\nА то')
-    expect(minio.secretKey).toEqual('minio2')
-    expect(minio.contentTypes).toEqual(['image/jpeg', 'image/gif'])
-    expect((minio as any).downloadUrl).toEqual('https://front.hc.engineering')
-  })
 })
diff --git a/server/tool/src/initializer.ts b/server/tool/src/initializer.ts
index 4da3975233..ccee09bacf 100644
--- a/server/tool/src/initializer.ts
+++ b/server/tool/src/initializer.ts
@@ -315,5 +315,6 @@ export class WorkspaceInitializer {
         return value
       }
     }
+    return value
   }
 }
diff --git a/tests/sanity/tests/model/common-page.ts b/tests/sanity/tests/model/common-page.ts
index fd5cbe1bdf..0ee1643926 100644
--- a/tests/sanity/tests/model/common-page.ts
+++ b/tests/sanity/tests/model/common-page.ts
@@ -1,4 +1,5 @@
 import { type Locator, type Page, expect } from '@playwright/test'
+import { DateDivided } from './types'
 
 export class CommonPage {
   readonly page: Page
@@ -11,9 +12,9 @@ export class CommonPage {
   selectPopupInputSearch = (): Locator => this.page.locator('div.popup input.search')
   selectPopupListItem = (name: string): Locator => this.page.locator('div.selectPopup div.list-item', { hasText: name })
   selectPopupListItemFirst = (): Locator => this.page.locator('div.selectPopup div.list-item')
-  selectPopupHeaderButtonLast = (): Locator => this.page.locator('div.selectPopup div.header button:last-child')
+  selectPopupAddButton = (): Locator => this.page.locator('div.selectPopup button[data-id="btnAdd"]')
   selectPopupButton = (): Locator => this.page.locator('div.selectPopup button')
-  selectPopupHeaderButtonFirst = (): Locator => this.page.locator('div.selectPopup div.header button:nth-of-type(1)')
+  selectPopupExpandButton = (): Locator => this.page.locator('div.selectPopup button[data-id="btnExpand"]')
   popupSpanLabel = (point: string): Locator =>
     this.page.locator('div[class$="opup"] span[class*="label"]', { hasText: point })
 
@@ -46,6 +47,46 @@ export class CommonPage {
   menuPopupItemButton = (itemText: string): Locator =>
     this.page.locator('div.selectPopup button.menu-item', { hasText: itemText })
 
+  buttonFilter = (): Locator => this.page.getByRole('button', { name: 'Filter' })
+  inputFilterTitle = (): Locator => this.page.locator('div.selectPopup input[placeholder="Title"]')
+  inputSearch = (): Locator => this.page.locator('div.selectPopup input[placeholder="Search..."]')
+  buttonFilterApply = (): Locator => this.page.locator('div.selectPopup button[type="button"]', { hasText: 'Apply' })
+  buttonClearFilters = (): Locator => this.page.locator('button > span', { hasText: 'Clear filters' })
+  filterButton = (index: number): Locator => this.page.locator(`div.filter-section button:nth-child(${index})`)
+  selectFilterSection = (label: string): Locator =>
+    this.page.locator('div.filterbar-container div.filter-section', { hasText: label })
+
+  selectPopupMenu = (filter: string): Locator =>
+    this.page.locator('div.selectPopup [class*="menu"]', { hasText: filter })
+
+  calendarDay = (daySelector: string): Locator => this.page.locator(`div.popup div.calendar button.day${daySelector}`)
+
+  linesFromTable = (text: string = ''): Locator =>
+    this.page.locator('.hulyComponent table tbody tr').filter({ hasText: text })
+
+  linesFromList = (text: string = ''): Locator =>
+    this.page.locator('.hulyComponent .list-container div.row').filter({ hasText: text })
+
+  firstInputFirstDigit = (): Locator =>
+    this.page.locator('div.date-popup-container div.input:first-child span.digit:first-child')
+
+  firstInputThirdDigit = (): Locator =>
+    this.page.locator('div.date-popup-container div.input:first-child span.digit:nth-child(3)')
+
+  firstInputFifthDigit = (): Locator =>
+    this.page.locator('div.date-popup-container div.input:first-child span.digit:nth-child(5)')
+
+  lastInputFirstDigit = (): Locator =>
+    this.page.locator('div.date-popup-container div.input:last-child span.digit:first-child')
+
+  lastInputThirdDigit = (): Locator =>
+    this.page.locator('div.date-popup-container div.input:last-child span.digit:nth-child(3)')
+
+  lastInputFifthDigit = (): Locator =>
+    this.page.locator('div.date-popup-container div.input:last-child span.digit:nth-child(5)')
+
+  submitButton = (): Locator => this.page.locator('div.date-popup-container button[type="submit"]')
+
   async selectMenuItem (page: Page, name: string, fullWordFilter: boolean = false): Promise<void> {
     if (name !== 'first') {
       const filterText = fullWordFilter ? name : name.split(' ')[0]
@@ -57,11 +98,11 @@ export class CommonPage {
   }
 
   async pressCreateButtonSelectPopup (page: Page): Promise<void> {
-    await this.selectPopupHeaderButtonLast().click()
+    await this.selectPopupAddButton().click()
   }
 
   async pressShowAllButtonSelectPopup (page: Page): Promise<void> {
-    await this.selectPopupHeaderButtonFirst().click()
+    await this.selectPopupExpandButton().click()
   }
 
   async selectFromDropdown (page: Page, point: string): Promise<void> {
@@ -159,4 +200,102 @@ export class CommonPage {
   async checkPopupItem (itemText: string): Promise<void> {
     await expect(this.menuPopupItemButton(itemText)).toBeVisible()
   }
+
+  async selectFilter (filter: string, filterSecondLevel?: string): Promise<void> {
+    await this.buttonFilter().click()
+    await this.selectPopupMenu(filter).click()
+
+    if (filterSecondLevel !== null && typeof filterSecondLevel === 'string') {
+      switch (filter) {
+        case 'Title':
+          await this.inputFilterTitle().fill(filterSecondLevel)
+          await this.buttonFilterApply().click()
+          break
+        case 'Labels':
+          await this.selectFromDropdown(this.page, filterSecondLevel)
+          break
+        case 'Skills':
+          await this.inputSearch().fill(filterSecondLevel)
+          await this.selectFromDropdown(this.page, filterSecondLevel)
+          await this.page.keyboard.press('Escape')
+          break
+        default:
+          await this.selectPopupMenu(filterSecondLevel).click()
+      }
+    }
+  }
+
+  async filterOppositeCondition (filter: string, conditionBefore: string, conditionAfter: string): Promise<void> {
+    const filterSection = this.selectFilterSection(filter)
+    await filterSection.locator('button', { hasText: conditionBefore }).isVisible()
+    await filterSection.locator('button[data-id="btnCondition"]').click()
+    await this.page.locator('div.selectPopup button.menu-item', { hasText: conditionAfter }).click()
+  }
+
+  async checkFilter (filter: string, filterSecondLevel?: string, filterThirdLevel?: string): Promise<void> {
+    await expect(this.filterButton(1)).toHaveText(filter)
+    if (filterSecondLevel !== undefined) {
+      await expect(this.filterButton(2)).toContainText(filterSecondLevel)
+    }
+    if (filterThirdLevel !== undefined) {
+      await expect(this.filterButton(3)).toContainText(filterThirdLevel)
+    }
+  }
+
+  async updateFilterDimension (
+    filterSecondLevel: string,
+    dateStart?: string,
+    needToOpenCalendar: boolean = false
+  ): Promise<void> {
+    await this.filterButton(2).click()
+    await this.selectPopupMenu(filterSecondLevel).click()
+
+    if (dateStart !== undefined) {
+      if (needToOpenCalendar) {
+        await this.filterButton(3).click()
+      }
+      await this.calendarDay(dateStart === 'Today' ? '.today' : `:has-text("${dateStart}")`).click()
+    }
+  }
+
+  async fillBetweenDate (dateStart: DateDivided, dateEnd: DateDivided): Promise<void> {
+    // dateStart - day
+    await this.firstInputFirstDigit().click({ delay: 100, position: { x: 1, y: 1 } })
+    await this.firstInputFirstDigit().pressSequentially(dateStart.day)
+
+    // dateStart - month
+    await this.firstInputThirdDigit().click({ delay: 100, position: { x: 1, y: 1 } })
+    await this.firstInputThirdDigit().pressSequentially(dateStart.month)
+
+    // dateStart - year
+    await this.firstInputFifthDigit().click({ delay: 100, position: { x: 1, y: 1 } })
+    await this.firstInputFifthDigit().pressSequentially(dateStart.year)
+
+    // dateEnd - day
+    await this.lastInputFirstDigit().click({ delay: 100, position: { x: 1, y: 1 } })
+    await this.lastInputFirstDigit().pressSequentially(dateEnd.day)
+
+    // dateEnd - month
+    await this.lastInputThirdDigit().click({ delay: 100, position: { x: 1, y: 1 } })
+    await this.lastInputThirdDigit().pressSequentially(dateEnd.month)
+
+    // dateEnd - year
+    await this.lastInputFifthDigit().click({ delay: 100, position: { x: 1, y: 1 } })
+    await this.lastInputFifthDigit().pressSequentially(dateEnd.year)
+
+    // Submit
+    await this.submitButton().click({ delay: 100 })
+  }
+
+  async checkRowsInTableExist (text: string, count: number = 1): Promise<void> {
+    await expect(this.linesFromTable(text)).toHaveCount(count)
+  }
+
+  async checkRowsInTableNotExist (text: string): Promise<void> {
+    await expect(this.linesFromTable(text)).toHaveCount(0)
+  }
+
+  async openRowInTableByText (text: string): Promise<void> {
+    await this.linesFromTable(text).locator('a', { hasText: text }).click()
+  }
 }
diff --git a/tests/sanity/tests/model/left-side-menu-page.ts b/tests/sanity/tests/model/left-side-menu-page.ts
index e1c06c9dac..762fa5d3af 100644
--- a/tests/sanity/tests/model/left-side-menu-page.ts
+++ b/tests/sanity/tests/model/left-side-menu-page.ts
@@ -15,6 +15,8 @@ export class LeftSideMenuPage extends CommonPage {
   buttonRecruiting = (): Locator => this.page.locator('[id="app-recruit\\:string\\:RecruitApplication"]')
   buttonNotification = (): Locator => this.page.locator('button[id$="Inbox"]')
   buttonDocuments = (): Locator => this.page.locator('button[id$="document:string:DocumentApplication"]')
+  buttonPlanner = (): Locator => this.page.locator('button[id$="app-time:string:Planner"]')
+  buttonTeam = (): Locator => this.page.locator('button[id$="app-time:string:Team"]')
   profileButton = (): Locator => this.page.locator('#profile-button')
   inviteToWorkspaceButton = (): Locator => this.page.locator('button:has-text("Invite to workspace")')
   getInviteLinkButton = (): Locator => this.page.locator('button:has-text("Get invite link")')
@@ -53,6 +55,14 @@ export class LeftSideMenuPage extends CommonPage {
     await this.buttonDocuments().click()
   }
 
+  async clickPlanner (): Promise<void> {
+    await this.buttonPlanner().click()
+  }
+
+  async clickTeam (): Promise<void> {
+    await this.buttonTeam().click()
+  }
+
   async clickRecruiting (): Promise<void> {
     await this.buttonRecruiting().click()
   }
diff --git a/tests/sanity/tests/model/planning/planning-navigation-menu-page.ts b/tests/sanity/tests/model/planning/planning-navigation-menu-page.ts
index 6ec86fe7ad..f7ab9e64e0 100644
--- a/tests/sanity/tests/model/planning/planning-navigation-menu-page.ts
+++ b/tests/sanity/tests/model/planning/planning-navigation-menu-page.ts
@@ -1,4 +1,4 @@
-import { type Locator, type Page } from '@playwright/test'
+import { type Locator, type Page, expect } from '@playwright/test'
 
 export class PlanningNavigationMenuPage {
   readonly page: Page
@@ -20,6 +20,9 @@ export class PlanningNavigationMenuPage {
   readonly buttonToDoPlanned = (): Locator =>
     this.page.locator('button[class*="hulyNavItem-container"] span[class*="hulyNavItem-label"]:text-is("Planned")')
 
+  readonly accordionContainerToDoUnplanned = (): Locator =>
+    this.page.locator('div.toDos-container div.hulyAccordionItem-container', { hasText: 'Unplanned' })
+
   async clickOnButtonToDoAll (): Promise<void> {
     await this.buttonToDoAll().click()
   }
@@ -31,4 +34,13 @@ export class PlanningNavigationMenuPage {
   async clickOnButtonToDoPlanned (): Promise<void> {
     await this.buttonToDoPlanned().click()
   }
+
+  async compareCountersUnplannedToDos (): Promise<void> {
+    const navCount = parseInt(
+      await this.buttonToDoUnplanned().locator('xpath=..').locator('span.hulyNavItem-count').innerText(),
+      10
+    )
+    const accCount = await this.accordionContainerToDoUnplanned().locator('button.hulyToDoLine-container').count()
+    expect(accCount).toBe(navCount)
+  }
 }
diff --git a/tests/sanity/tests/model/planning/planning-page.ts b/tests/sanity/tests/model/planning/planning-page.ts
index 7f7e36406f..3cf324d284 100644
--- a/tests/sanity/tests/model/planning/planning-page.ts
+++ b/tests/sanity/tests/model/planning/planning-page.ts
@@ -2,6 +2,8 @@ import { type Locator, type Page, expect } from '@playwright/test'
 import { NewToDo, Slot } from './types'
 import { CalendarPage } from '../calendar-page'
 
+const retryOptions = { intervals: [1000, 1500, 2500], timeout: 60000 }
+
 export class PlanningPage extends CalendarPage {
   readonly page: Page
 
@@ -30,6 +32,9 @@ export class PlanningPage extends CalendarPage {
   readonly buttonPopupVisibleToEveryone = (): Locator =>
     this.popup().getByRole('button', { name: 'Visible to everyone' })
 
+  readonly buttonPopupOnlyVisibleToYou = (): Locator =>
+    this.popup().getByRole('button', { name: 'Only visible to you' })
+
   readonly buttonPopupSave = (): Locator => this.popup().getByRole('button', { name: 'Save' })
   readonly buttonPopupCreateAddLabel = (): Locator =>
     this.popup().locator('button.antiButton', { hasText: 'Add label' })
@@ -78,14 +83,17 @@ export class PlanningPage extends CalendarPage {
 
   async dragdropTomorrow (title: string, time: string): Promise<void> {
     await this.toDosContainer().getByRole('button', { name: title }).hover()
-    await this.page.mouse.down()
-    const boundingBox = await this.selectTomorrow(time).boundingBox()
-    expect(boundingBox).toBeTruthy()
-    if (boundingBox != null) {
-      await this.page.mouse.move(boundingBox.x + 10, boundingBox.y + 10)
-      await this.page.mouse.move(boundingBox.x + 10, boundingBox.y + 20)
-      await this.page.mouse.up()
-    }
+
+    await expect(async () => {
+      await this.page.mouse.down()
+      const boundingBox = await this.selectTomorrow(time).boundingBox()
+      expect(boundingBox).toBeTruthy()
+      if (boundingBox != null) {
+        await this.page.mouse.move(boundingBox.x + 10, boundingBox.y + 10)
+        await this.page.mouse.move(boundingBox.x + 10, boundingBox.y + 20)
+        await this.page.mouse.up()
+      }
+    }).toPass(retryOptions)
   }
 
   async checkInSchedule (title: string): Promise<void> {
diff --git a/tests/sanity/tests/model/recruiting/talent-details-page.ts b/tests/sanity/tests/model/recruiting/talent-details-page.ts
index 847c783c6f..64cef5795a 100644
--- a/tests/sanity/tests/model/recruiting/talent-details-page.ts
+++ b/tests/sanity/tests/model/recruiting/talent-details-page.ts
@@ -10,6 +10,7 @@ export class TalentDetailsPage extends CommonRecruitingPage {
     this.page = page
   }
 
+  readonly buttonClosePanel = (): Locator => this.page.locator('#btnPClose')
   readonly buttonAddSkill = (): Locator => this.page.locator('button#add-tag')
   readonly textTagItem = (): Locator => this.page.locator('div.tag-item')
   readonly inputLocation = (): Locator => this.page.locator('div.location input')
diff --git a/tests/sanity/tests/model/team-page.ts b/tests/sanity/tests/model/team-page.ts
new file mode 100644
index 0000000000..8bba4f4e29
--- /dev/null
+++ b/tests/sanity/tests/model/team-page.ts
@@ -0,0 +1,26 @@
+import { expect, Locator, Page } from '@playwright/test'
+import { CommonPage } from './common-page'
+
+export class TeamPage extends CommonPage {
+  readonly page: Page
+
+  constructor (page: Page) {
+    super(page)
+    this.page = page
+  }
+
+  appHeader = (): Locator => this.page.locator('div.hulyNavPanel-header', { hasText: 'Team Planner' })
+  buttonTeam = (name: string): Locator =>
+    this.page.locator('div#navGroup-projects-planning button.hulyNavItem-container', { hasText: name })
+
+  buttonNextDay = (): Locator =>
+    this.page.locator('div.hulyComponent div.hulyHeader-container .actions button[data-id="btnNext"]')
+
+  async checkTeamPageIsOpened (): Promise<void> {
+    await expect(this.appHeader()).toBeVisible()
+  }
+
+  async selectTeam (name: string): Promise<void> {
+    await this.buttonTeam(name).click()
+  }
+}
diff --git a/tests/sanity/tests/model/tracker/common-tracker-page.ts b/tests/sanity/tests/model/tracker/common-tracker-page.ts
index a6eec6144c..a825c148df 100644
--- a/tests/sanity/tests/model/tracker/common-tracker-page.ts
+++ b/tests/sanity/tests/model/tracker/common-tracker-page.ts
@@ -1,6 +1,5 @@
 import { expect, Locator, Page } from '@playwright/test'
 import { CalendarPage } from '../calendar-page'
-import { DateDivided } from './types'
 import path from 'path'
 
 export class CommonTrackerPage extends CalendarPage {
@@ -36,16 +35,9 @@ export class CommonTrackerPage extends CalendarPage {
     this.page.locator('div[slot="header"] div.item div.name', { hasText: fileName })
 
   commentImg = (): Locator => this.page.locator('div.activityMessage div.content img')
-  inputFilterTitle = (): Locator => this.page.locator('div.selectPopup input[placeholder="Title"]')
-  buttonFilterApply = (): Locator => this.page.locator('div.selectPopup button[type="button"]', { hasText: 'Apply' })
-  buttonClearFilters = (): Locator => this.page.locator('button > span', { hasText: 'Clear filters' })
   textCategoryHeader = (): Locator =>
     this.page.locator('div.category-container > div.categoryHeader span[class*="label"]')
 
-  buttonFilter = (): Locator => this.page.getByRole('button', { name: 'Filter' })
-  selectPopupMenu = (filter: string): Locator =>
-    this.page.locator('div.selectPopup [class*="menu"]', { hasText: filter })
-
   popupCalendarButton = (dateStart: string): Locator =>
     this.page.locator('div.popup div.calendar button.day', { hasText: dateStart })
 
@@ -59,27 +51,6 @@ export class CommonTrackerPage extends CalendarPage {
     this.page.locator('div.date-popup-container div.input:first-child span.digit:nth-child(5)')
 
   submitDatePopup = (): Locator => this.page.locator('div.date-popup-container button[type="submit"]')
-  filterButton = (index: number): Locator => this.page.locator(`div.filter-section button:nth-child(${index})`)
-  calendarDay = (daySelector: string): Locator => this.page.locator(`div.popup div.calendar button.day${daySelector}`)
-  firstInputFirstDigit = (): Locator =>
-    this.page.locator('div.date-popup-container div.input:first-child span.digit:first-child')
-
-  firstInputThirdDigit = (): Locator =>
-    this.page.locator('div.date-popup-container div.input:first-child span.digit:nth-child(3)')
-
-  firstInputFifthDigit = (): Locator =>
-    this.page.locator('div.date-popup-container div.input:first-child span.digit:nth-child(5)')
-
-  lastInputFirstDigit = (): Locator =>
-    this.page.locator('div.date-popup-container div.input:last-child span.digit:first-child')
-
-  lastInputThirdDigit = (): Locator =>
-    this.page.locator('div.date-popup-container div.input:last-child span.digit:nth-child(3)')
-
-  lastInputFifthDigit = (): Locator =>
-    this.page.locator('div.date-popup-container div.input:last-child span.digit:nth-child(5)')
-
-  submitButton = (): Locator => this.page.locator('div.date-popup-container button[type="submit"]')
 
   trackerApplicationButton = (): Locator => this.page.locator('[id="app-tracker\\:string\\:TrackerApplication"]')
   componentsLink = (): Locator => this.page.locator('text=Components')
@@ -101,7 +72,6 @@ export class CommonTrackerPage extends CalendarPage {
   header = (): Locator =>
     this.page.locator('button.hulyBreadcrumb-container > span.hulyBreadcrumb-label', { hasText: 'Issues' })
 
-  filter = (): Locator => this.page.getByRole('button', { name: 'Filter' })
   view = (): Locator => this.page.locator('.hulyHeader-buttonsGroup > button[data-id="btn-viewOptions"]')
   showMore = (): Locator => this.page.locator('.hulyHeader-buttonsGroup > button[data-id="btn-viewSetting"]')
   task1 = (): Locator => this.page.getByRole('link', { name: 'Welcome to Huly! 🌟' })
@@ -177,80 +147,6 @@ export class CommonTrackerPage extends CalendarPage {
     await this.page.waitForSelector('form.antiCard', { state: 'detached' })
   }
 
-  async selectFilter (filter: string, filterSecondLevel?: string): Promise<void> {
-    await this.buttonFilter().click()
-    await this.selectPopupMenu(filter).click()
-
-    if (filterSecondLevel !== null && typeof filterSecondLevel === 'string') {
-      switch (filter) {
-        case 'Title':
-          await this.inputFilterTitle().fill(filterSecondLevel)
-          await this.buttonFilterApply().click()
-          break
-        case 'Labels':
-          await this.selectFromDropdown(this.page, filterSecondLevel)
-          break
-        default:
-          await this.selectPopupMenu(filterSecondLevel).click()
-      }
-    }
-  }
-
-  async checkFilter (filter: string, filterSecondLevel?: string, filterThirdLevel?: string): Promise<void> {
-    await expect(this.filterButton(1)).toHaveText(filter)
-    if (filterSecondLevel !== undefined) {
-      await expect(this.filterButton(2)).toContainText(filterSecondLevel)
-    }
-    if (filterThirdLevel !== undefined) {
-      await expect(this.filterButton(3)).toContainText(filterThirdLevel)
-    }
-  }
-
-  async updateFilterDimension (
-    filterSecondLevel: string,
-    dateStart?: string,
-    needToOpenCalendar: boolean = false
-  ): Promise<void> {
-    await this.filterButton(2).click()
-    await this.selectPopupMenu(filterSecondLevel).click()
-
-    if (dateStart !== undefined) {
-      if (needToOpenCalendar) {
-        await this.filterButton(3).click()
-      }
-      await this.calendarDay(dateStart === 'Today' ? '.today' : `:has-text("${dateStart}")`).click()
-    }
-  }
-
-  async fillBetweenDate (dateStart: DateDivided, dateEnd: DateDivided): Promise<void> {
-    // dateStart - day
-    await this.firstInputFirstDigit().click({ delay: 100, position: { x: 1, y: 1 } })
-    await this.firstInputFirstDigit().pressSequentially(dateStart.day)
-
-    // dateStart - month
-    await this.firstInputThirdDigit().click({ delay: 100, position: { x: 1, y: 1 } })
-    await this.firstInputThirdDigit().pressSequentially(dateStart.month)
-
-    // dateStart - year
-    await this.firstInputFifthDigit().click({ delay: 100, position: { x: 1, y: 1 } })
-    await this.firstInputFifthDigit().pressSequentially(dateStart.year)
-
-    // dateEnd - day
-    await this.lastInputFirstDigit().click({ delay: 100, position: { x: 1, y: 1 } })
-    await this.lastInputFirstDigit().pressSequentially(dateEnd.day)
-
-    // dateEnd - month
-    await this.lastInputThirdDigit().click({ delay: 100, position: { x: 1, y: 1 } })
-    await this.lastInputThirdDigit().pressSequentially(dateEnd.month)
-
-    // dateEnd - year
-    await this.lastInputFifthDigit().click({ delay: 100, position: { x: 1, y: 1 } })
-    await this.lastInputFifthDigit().pressSequentially(dateEnd.year)
-
-    // Submit
-    await this.submitButton().click({ delay: 100 })
-  }
-
   async addComment (comment: string): Promise<void> {
     await this.inputComment().fill(comment)
     await this.buttonSendComment().click()
@@ -313,7 +209,7 @@ export class CommonTrackerPage extends CalendarPage {
 
   async checkIfMainPanelIsVisible (): Promise<void> {
     await expect(this.header()).toBeVisible({ timeout: 60000 })
-    await expect(this.filter()).toBeVisible()
+    await expect(this.buttonFilter()).toBeVisible()
     await expect(this.view()).toBeVisible()
     await expect(this.showMore()).toBeVisible()
   }
diff --git a/tests/sanity/tests/model/tracker/issues-page.ts b/tests/sanity/tests/model/tracker/issues-page.ts
index f1004db822..2c409e39eb 100644
--- a/tests/sanity/tests/model/tracker/issues-page.ts
+++ b/tests/sanity/tests/model/tracker/issues-page.ts
@@ -63,7 +63,6 @@ export class IssuesPage extends CommonTrackerPage {
   buttonCollapsedCategories = (): Locator => this.page.locator('div.categoryHeader.collapsed')
   pupupTagsPopup = (): Locator => this.page.locator('.popup#TagsPopup')
   issueNotExist = (issueName: string): Locator => this.page.locator('tr', { hasText: issueName })
-  filterRowExists = (issueName: string): Locator => this.page.locator('div.row span', { hasText: issueName })
   issueListGrid = (): Locator => this.page.locator('div.listGrid')
   issueList = (): Locator => this.page.locator('div[class*="square"] > div')
   issueByName = (issueName: string): Locator => this.page.locator('a', { hasText: issueName })
@@ -512,11 +511,11 @@ export class IssuesPage extends CommonTrackerPage {
   }
 
   async checkFilteredIssueExist (issueName: string): Promise<void> {
-    await expect(this.filterRowExists(issueName)).toHaveCount(1)
+    await expect(this.linesFromList(issueName)).toHaveCount(1)
   }
 
   async checkFilteredIssueNotExist (issueName: string): Promise<void> {
-    await expect(this.filterRowExists(issueName)).toHaveCount(0)
+    await expect(this.linesFromList(issueName)).toHaveCount(0)
   }
 
   async checkAllIssuesInStatus (statusId?: string, statusName?: string): Promise<void> {
diff --git a/tests/sanity/tests/model/tracker/types.ts b/tests/sanity/tests/model/tracker/types.ts
index 5adfb4999d..0c7267d203 100644
--- a/tests/sanity/tests/model/tracker/types.ts
+++ b/tests/sanity/tests/model/tracker/types.ts
@@ -49,9 +49,3 @@ export interface NewComponent {
   description?: string
   lead?: string
 }
-
-export interface DateDivided {
-  day: string
-  month: string
-  year: string
-}
diff --git a/tests/sanity/tests/model/types.ts b/tests/sanity/tests/model/types.ts
new file mode 100644
index 0000000000..6acf58b8ea
--- /dev/null
+++ b/tests/sanity/tests/model/types.ts
@@ -0,0 +1,5 @@
+export interface DateDivided {
+  day: string
+  month: string
+  year: string
+}
diff --git a/tests/sanity/tests/planning/plan.spec.ts b/tests/sanity/tests/planning/plan.spec.ts
index e0a9e25617..606d28f46f 100644
--- a/tests/sanity/tests/planning/plan.spec.ts
+++ b/tests/sanity/tests/planning/plan.spec.ts
@@ -1,8 +1,16 @@
 import { test } from '@playwright/test'
-import { generateId, PlatformSetting, PlatformURI } from '../utils'
+import { generateId, PlatformSetting, PlatformURI, generateTestData } from '../utils'
 import { PlanningPage } from '../model/planning/planning-page'
 import { NewToDo } from '../model/planning/types'
 import { PlanningNavigationMenuPage } from '../model/planning/planning-navigation-menu-page'
+import { SignUpData } from '../model/common-types'
+import { TestData } from '../chat/types'
+import { faker } from '@faker-js/faker'
+import { LeftSideMenuPage } from '../model/left-side-menu-page'
+import { ApiEndpoint } from '../API/Api'
+import { LoginPage } from '../model/login-page'
+import { SignInJoinPage } from '../model/signin-page'
+import { TeamPage } from '../model/team-page'
 
 test.use({
   storageState: PlatformSetting
@@ -160,22 +168,74 @@ test.describe('Planning ToDo tests', () => {
     await planningPage.checkTimeSlotEndDate(1, dateEndTomorrow.getDate().toString())
   })
 
-  test("Drag'n'drop added Todo", async ({ page }) => {
+  test('Adding ToDo by dragging and checking visibility in the Team Planner', async ({ browser, page, request }) => {
+    const data: TestData = generateTestData()
+    const newUser2: SignUpData = {
+      firstName: faker.person.firstName(),
+      lastName: faker.person.lastName(),
+      email: faker.internet.email(),
+      password: '1234'
+    }
+    const titleV = `Visible ToDo ${generateId()}`
+    const titleI = `Inisible ToDo ${generateId()}`
+
     let hour = new Date().getHours()
     const ampm = hour < 13 ? 'am' : 'pm'
     hour = hour < 1 ? 1 : hour >= 11 && hour < 13 ? 11 : hour >= 22 ? 10 : hour > 12 ? hour - 12 : hour
-    const time = `${hour}${ampm}`
-    const title = `Drag and drop ToDo ${generateId()}`
+    const timeV = `${hour}${ampm}`
+    const timeI = `${hour + 1}${ampm}`
+
+    const leftSideMenuPage: LeftSideMenuPage = new LeftSideMenuPage(page)
+    const loginPage: LoginPage = new LoginPage(page)
+    const api: ApiEndpoint = new ApiEndpoint(request)
+    await api.createAccount(data.userName, '1234', data.firstName, data.lastName)
+    await api.createWorkspaceWithLogin(data.workspaceName, data.userName, '1234')
+    await (await page.goto(`${PlatformURI}`))?.finished()
+    await loginPage.login(data.userName, '1234')
+    await (await page.goto(`${PlatformURI}/workbench/${data.workspaceName}`))?.finished()
+    await leftSideMenuPage.clickPlanner()
 
     const planningNavigationMenuPage = new PlanningNavigationMenuPage(page)
     await planningNavigationMenuPage.clickOnButtonToDoAll()
     const planningPage = new PlanningPage(page)
-    await planningPage.selectInputToDo().fill(title)
+
+    await planningPage.selectInputToDo().fill(titleV)
     await planningPage.selectInputToDo().press('Enter')
-    await planningPage.dragdropTomorrow(title, time)
-    await planningPage.eventInSchedule(title).click()
+    await planningPage.dragdropTomorrow(titleV, timeV)
+    await planningPage.eventInSchedule(titleV).click()
     await planningPage.buttonPopupCreateVisible().click()
     await planningPage.buttonPopupVisibleToEveryone().click()
     await planningPage.buttonPopupSave().click()
+
+    await planningPage.selectInputToDo().fill(titleI)
+    await planningPage.selectInputToDo().press('Enter')
+    await planningPage.dragdropTomorrow(titleI, timeI)
+    await planningPage.eventInSchedule(titleI).click()
+    await planningPage.buttonPopupCreateVisible().click()
+    await planningPage.buttonPopupOnlyVisibleToYou().click()
+    await planningPage.buttonPopupSave().click()
+
+    await leftSideMenuPage.openProfileMenu()
+    await leftSideMenuPage.inviteToWorkspace()
+    await leftSideMenuPage.getInviteLink()
+    const linkText = await page.locator('.antiPopup .link').textContent()
+    const page2 = await browser.newPage()
+    const leftSideMenuPageSecond = new LeftSideMenuPage(page2)
+    await api.createAccount(newUser2.email, newUser2.password, newUser2.firstName, newUser2.lastName)
+    await page2.goto(linkText ?? '')
+    const joinPage = new SignInJoinPage(page2)
+    await joinPage.join(newUser2)
+
+    await leftSideMenuPageSecond.clickTeam()
+    const teamPage = new TeamPage(page2)
+    await teamPage.checkTeamPageIsOpened()
+    await teamPage.selectTeam('Default')
+    await teamPage.buttonNextDay().click()
+    await page2
+      .locator('div.hulyComponent div.item', { hasText: 'Tomorrow' })
+      .locator('div.item', { hasText: 'Busy 30m' })
+      .isVisible()
+
+    await page2.close()
   })
 })
diff --git a/tests/sanity/tests/planning/todos.spec.ts b/tests/sanity/tests/planning/todos.spec.ts
index bbe2b430b8..67459269fa 100644
--- a/tests/sanity/tests/planning/todos.spec.ts
+++ b/tests/sanity/tests/planning/todos.spec.ts
@@ -1,4 +1,4 @@
-import { test } from '@playwright/test'
+import { test, expect } from '@playwright/test'
 import { generateId, PlatformSetting, PlatformURI } from '../utils'
 import { PlanningPage } from '../model/planning/planning-page'
 import { NewToDo } from '../model/planning/types'
@@ -8,12 +8,14 @@ test.use({
   storageState: PlatformSetting
 })
 
+const retryOptions = { intervals: [1000, 1500, 2500], timeout: 60000 }
+
 test.describe('Planning ToDo tests', () => {
   test.beforeEach(async ({ page }) => {
     await (await page.goto(`${PlatformURI}/workbench/sanity-ws/time`))?.finished()
   })
 
-  test('New ToDo', async ({ page }) => {
+  test('New ToDo and checking notifications about unplanned tasks', async ({ page }) => {
     const dateEnd = new Date()
     dateEnd.setDate(dateEnd.getDate() + 1)
 
@@ -40,9 +42,15 @@ test.describe('Planning ToDo tests', () => {
     }
 
     const planningPage = new PlanningPage(page)
-    await planningPage.createNewToDo(newToDo)
-
     const planningNavigationMenuPage = new PlanningNavigationMenuPage(page)
+    await planningNavigationMenuPage.clickOnButtonUnplanned()
+    await expect(async () => {
+      await planningNavigationMenuPage.compareCountersUnplannedToDos()
+    }).toPass(retryOptions)
+    await planningPage.createNewToDo(newToDo)
+    await expect(async () => {
+      await planningNavigationMenuPage.compareCountersUnplannedToDos()
+    }).toPass(retryOptions)
     await planningNavigationMenuPage.clickOnButtonToDoAll()
 
     await planningPage.checkToDoExist(newToDo.title)
diff --git a/tests/sanity/tests/recruiting/talents.spec.ts b/tests/sanity/tests/recruiting/talents.spec.ts
index ddd646e5e4..dbe51ed5f0 100644
--- a/tests/sanity/tests/recruiting/talents.spec.ts
+++ b/tests/sanity/tests/recruiting/talents.spec.ts
@@ -131,4 +131,21 @@ test.describe('candidate/talents tests', () => {
     await talentsPage.rightClickAction(talentName, 'Match to vacancy')
     await talentsPage.checkMatchVacancy(`${talentName.lastName} ${talentName.firstName}`, '0')
   })
+
+  test('Filtering talents by skills', async ({ page }) => {
+    const skillName = `Skill-${generateId(4)}`
+    const talentName = 'P. Andrey'
+
+    await navigationMenuPage.clickButtonTalents()
+    await talentsPage.checkRowsInTableExist(talentName)
+    const talentsCount = await talentsPage.linesFromTable().count()
+    await talentsPage.openRowInTableByText(talentName)
+    await talentDetailsPage.addSkill(skillName, 'Skill Description')
+    await talentDetailsPage.buttonClosePanel().click()
+    await talentsPage.selectFilter('Skills', skillName)
+    await talentsPage.checkRowsInTableExist(talentName)
+    await talentsPage.filterOppositeCondition('Skill', 'is', 'is not')
+    await talentsPage.checkRowsInTableNotExist(talentName)
+    await talentsPage.checkRowsInTableExist('', talentsCount - 1)
+  })
 })
diff --git a/tests/sanity/tests/tracker/filter.spec.ts b/tests/sanity/tests/tracker/filter.spec.ts
index 6eb8cb3cdb..07f7093807 100644
--- a/tests/sanity/tests/tracker/filter.spec.ts
+++ b/tests/sanity/tests/tracker/filter.spec.ts
@@ -2,7 +2,8 @@ import { expect, test } from '@playwright/test'
 import { generateId, iterateLocator, PlatformSetting, PlatformURI } from '../utils'
 import { LeftSideMenuPage } from '../model/left-side-menu-page'
 import { IssuesPage } from '../model/tracker/issues-page'
-import { DateDivided, NewIssue } from '../model/tracker/types'
+import { NewIssue } from '../model/tracker/types'
+import { DateDivided } from '../model/types'
 import { DEFAULT_STATUSES, DEFAULT_STATUSES_ID, PRIORITIES } from './tracker.utils'
 import { IssuesDetailsPage } from '../model/tracker/issues-details-page'