diff --git a/models/document/src/index.ts b/models/document/src/index.ts
index 1e17d90d36f..29d0e74241d 100644
--- a/models/document/src/index.ts
+++ b/models/document/src/index.ts
@@ -217,8 +217,8 @@ function defineTeamspace (builder: Builder): void {
             key: 'hideArchived',
             type: 'toggle',
             defaultValue: true,
-            actionTarget: 'query',
-            action: document.function.HideArchivedTeamspaces,
+            actionTarget: 'options',
+            action: view.function.HideArchived,
             label: view.string.HideArchived
           }
         ]
diff --git a/models/document/src/plugin.ts b/models/document/src/plugin.ts
index 8f22ca83843..e83a4ff7c74 100644
--- a/models/document/src/plugin.ts
+++ b/models/document/src/plugin.ts
@@ -21,7 +21,7 @@ import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineer
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import { type TagCategory } from '@hcengineering/tags'
 import { type AnyComponent } from '@hcengineering/ui'
-import type { Viewlet, Action, ActionCategory, ViewAction, ViewQueryAction } from '@hcengineering/view'
+import type { Action, ActionCategory, ViewAction, Viewlet } from '@hcengineering/view'
 
 export default mergeIds(documentId, document, {
   component: {
@@ -52,8 +52,7 @@ export default mergeIds(documentId, document, {
   },
   function: {
     CanLockDocument: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
-    CanUnlockDocument: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
-    HideArchivedTeamspaces: '' as ViewQueryAction
+    CanUnlockDocument: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>
   },
   viewlet: {
     TeamspaceTable: '' as Ref<Viewlet>
diff --git a/models/drive/src/index.ts b/models/drive/src/index.ts
index 6b4b762f384..4e2f5cbda39 100644
--- a/models/drive/src/index.ts
+++ b/models/drive/src/index.ts
@@ -277,8 +277,8 @@ function defineDrive (builder: Builder): void {
             key: 'hideArchived',
             type: 'toggle',
             defaultValue: true,
-            actionTarget: 'query',
-            action: drive.function.HideArchivedDrives,
+            actionTarget: 'options',
+            action: view.function.HideArchived,
             label: view.string.HideArchived
           }
         ]
diff --git a/models/drive/src/plugin.ts b/models/drive/src/plugin.ts
index 032df816a8a..533cb025d5e 100644
--- a/models/drive/src/plugin.ts
+++ b/models/drive/src/plugin.ts
@@ -25,7 +25,6 @@ import {
   type ActionCategory,
   type ViewAction,
   type ViewActionAvailabilityFunction,
-  type ViewQueryAction,
   type Viewlet,
   type ViewletDescriptor
 } from '@hcengineering/view'
@@ -55,8 +54,7 @@ export default mergeIds(driveId, drive, {
     FolderLinkProvider: '' as Resource<(doc: Doc, props: Record<string, any>) => Promise<Location>>,
     FileLinkProvider: '' as Resource<(doc: Doc, props: Record<string, any>) => Promise<Location>>,
     CanRenameFile: '' as Resource<ViewActionAvailabilityFunction>,
-    CanRenameFolder: '' as Resource<ViewActionAvailabilityFunction>,
-    HideArchivedDrives: '' as ViewQueryAction
+    CanRenameFolder: '' as Resource<ViewActionAvailabilityFunction>
   },
   completion: {
     FileQuery: '' as Resource<ObjectSearchFactory>,
diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts
index d5d0d1eb47b..5804990126c 100644
--- a/models/recruit/src/index.ts
+++ b/models/recruit/src/index.ts
@@ -332,7 +332,9 @@ export function createModel (builder: Builder): void {
     key: 'hideArchived',
     type: 'toggle',
     defaultValue: true,
-    label: recruit.string.HideArchivedVacancies
+    actionTarget: 'options',
+    action: view.function.HideArchived,
+    label: view.string.HideArchived
   }
 
   builder.createDoc(
@@ -452,8 +454,8 @@ export function createModel (builder: Builder): void {
     key: 'hideArchivedVacancies',
     type: 'toggle',
     defaultValue: true,
-    actionTarget: 'query',
-    action: recruit.function.HideArchivedVacancies,
+    actionTarget: 'options',
+    action: view.function.HideArchived,
     label: recruit.string.HideApplicantsFromArchivedVacancies
   }
 
@@ -524,8 +526,7 @@ export function createModel (builder: Builder): void {
         }
       },
       baseQuery: {
-        isDone: false,
-        '$lookup.space.archived': false
+        isDone: false
       }
     },
     recruit.viewlet.TableApplicantMatch
@@ -777,9 +778,6 @@ export function createModel (builder: Builder): void {
         strict: true,
         hiddenKeys: ['name', 'space', 'modifiedOn']
       },
-      baseQuery: {
-        '$lookup.space.archived': false
-      },
       viewOptions: {
         groupBy: ['company', 'dueTo', 'createdBy'],
         orderBy: [
diff --git a/models/recruit/src/plugin.ts b/models/recruit/src/plugin.ts
index 59af01b4aeb..86bfa59d639 100644
--- a/models/recruit/src/plugin.ts
+++ b/models/recruit/src/plugin.ts
@@ -13,13 +13,15 @@
 // limitations under the License.
 //
 
-import type { Status, Client, Doc, Ref } from '@hcengineering/core'
+import { type DocUpdateMessageViewlet } from '@hcengineering/activity'
+import { type ChatMessageViewlet } from '@hcengineering/chunter'
+import type { Client, Doc, Ref, Status } from '@hcengineering/core'
 import { type NotificationGroup, type NotificationType } from '@hcengineering/notification'
-import type { IntlString, Resource, Status as OperationStatus } from '@hcengineering/platform'
+import type { IntlString, Status as OperationStatus, Resource } from '@hcengineering/platform'
 import { mergeIds } from '@hcengineering/platform'
 import { recruitId } from '@hcengineering/recruit'
 import recruit from '@hcengineering/recruit-resources/src/plugin'
-import { type TaskTypeDescriptor, type ProjectType } from '@hcengineering/task'
+import { type ProjectType, type TaskTypeDescriptor } from '@hcengineering/task'
 import type { AnyComponent, Location } from '@hcengineering/ui/src/types'
 import type {
   Action,
@@ -29,8 +31,6 @@ import type {
   ViewQueryAction,
   Viewlet
 } from '@hcengineering/view'
-import { type DocUpdateMessageViewlet } from '@hcengineering/activity'
-import { type ChatMessageViewlet } from '@hcengineering/chunter'
 
 export default mergeIds(recruitId, recruit, {
   action: {
@@ -57,7 +57,6 @@ export default mergeIds(recruitId, recruit, {
     GetObjectLink: '' as Resource<(doc: Doc, props: Record<string, any>) => Promise<string>>,
     GetTalentId: '' as Resource<(doc: Doc, props: Record<string, any>) => Promise<string>>,
     HideDoneState: '' as ViewQueryAction,
-    HideArchivedVacancies: '' as ViewQueryAction,
     ApplicantHasEmail: '' as Resource<ViewActionAvailabilityFunction>,
     ParseLinkId: '' as Resource<(id: string) => Promise<Ref<Doc> | undefined>>
   },
diff --git a/models/tracker/src/viewlets.ts b/models/tracker/src/viewlets.ts
index ee25b631970..80bccfed6b5 100644
--- a/models/tracker/src/viewlets.ts
+++ b/models/tracker/src/viewlets.ts
@@ -545,7 +545,10 @@ export function defineViewlets (builder: Builder): void {
           presenter: tracker.component.ModificationDatePresenter,
           displayProps: { fixed: 'right', dividerBefore: true }
         }
-      ]
+      ],
+      options: {
+        showArchived: true
+      }
     },
     tracker.viewlet.ProjectList
   )
diff --git a/models/view/src/plugin.ts b/models/view/src/plugin.ts
index ef992371203..e70704a6681 100644
--- a/models/view/src/plugin.ts
+++ b/models/view/src/plugin.ts
@@ -16,7 +16,13 @@
 import { type Blob, type Doc, type Ref } from '@hcengineering/core'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import { type AnyComponent } from '@hcengineering/ui/src/types'
-import { type FilterFunction, type ViewAction, type ViewCategoryAction, viewId } from '@hcengineering/view'
+import {
+  type FilterFunction,
+  type ViewAction,
+  type ViewCategoryAction,
+  viewId,
+  type ViewOptionsAction
+} from '@hcengineering/view'
 import { type BlobMetadata, type FileOrBlob, type FilePreviewExtension } from '@hcengineering/presentation/src/types'
 import { type PresentationMiddlewareFactory } from '@hcengineering/presentation/src/pipeline'
 import view from '@hcengineering/view-resources/src/plugin'
@@ -135,6 +141,7 @@ export default mergeIds(viewId, view, {
     FilterDateNotSpecified: '' as FilterFunction,
     FilterDateCustom: '' as FilterFunction,
     ShowEmptyGroups: '' as ViewCategoryAction,
+    HideArchived: '' as ViewOptionsAction,
     CanDeleteObject: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
     CanEditSpace: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
     CanArchiveSpace: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
diff --git a/packages/core/src/storage.ts b/packages/core/src/storage.ts
index aca92d3a258..ef9f1ef41ec 100644
--- a/packages/core/src/storage.ts
+++ b/packages/core/src/storage.ts
@@ -128,6 +128,8 @@ export type FindOptions<T extends Doc> = {
 
   // If specified total will be returned
   total?: boolean
+
+  showArchived?: boolean
 }
 
 /**
diff --git a/plugins/document-resources/src/index.ts b/plugins/document-resources/src/index.ts
index 2db4b0a18cf..04cfe530ba0 100644
--- a/plugins/document-resources/src/index.ts
+++ b/plugins/document-resources/src/index.ts
@@ -160,10 +160,6 @@ export async function canUnlockDocument (doc: Document | Document[]): Promise<bo
   return arr.some((p) => p.lockedBy != null)
 }
 
-export function hideArchivedTeamspaces (value: boolean, query: DocumentQuery<Teamspace>): DocumentQuery<Teamspace> {
-  return value ? { ...query, archived: false } : query
-}
-
 export default async (): Promise<Resources> => ({
   component: {
     CreateDocument,
@@ -202,8 +198,7 @@ export default async (): Promise<Resources> => ({
     CanLockDocument: canLockDocument,
     CanUnlockDocument: canUnlockDocument,
     GetDocumentLinkId: getDocumentLinkId,
-    ParseDocumentId: parseDocumentId,
-    HideArchivedTeamspaces: hideArchivedTeamspaces
+    ParseDocumentId: parseDocumentId
   },
   resolver: {
     Location: resolveLocation
diff --git a/plugins/drive-resources/src/index.ts b/plugins/drive-resources/src/index.ts
index d41c7bffcbc..22343aa278f 100644
--- a/plugins/drive-resources/src/index.ts
+++ b/plugins/drive-resources/src/index.ts
@@ -160,10 +160,6 @@ export async function CanRenameFolder (doc: Folder | Folder[] | undefined): Prom
   return doc !== undefined && !Array.isArray(doc)
 }
 
-export function HideArchivedDrives (value: boolean, query: DocumentQuery<Drive>): DocumentQuery<Drive> {
-  return value ? { ...query, archived: false } : query
-}
-
 export default async (): Promise<Resources> => ({
   component: {
     CreateDrive,
@@ -204,8 +200,7 @@ export default async (): Promise<Resources> => ({
     FileLinkProvider,
     FolderLinkProvider,
     CanRenameFile,
-    CanRenameFolder,
-    HideArchivedDrives
+    CanRenameFolder
   },
   resolver: {
     Location: resolveLocation
diff --git a/plugins/recruit-resources/src/components/Vacancies.svelte b/plugins/recruit-resources/src/components/Vacancies.svelte
index c1583df9f1e..c6b4e8cfd3c 100644
--- a/plugins/recruit-resources/src/components/Vacancies.svelte
+++ b/plugins/recruit-resources/src/components/Vacancies.svelte
@@ -205,10 +205,7 @@
       viewlet,
       viewOptions,
       viewOptionsConfig: viewlet.viewOptions?.other,
-      query: {
-        ...resultQuery,
-        ...(viewOptions?.hideArchived !== false ? { archived: false } : {})
-      },
+      query: resultQuery,
       totalQuery: {},
       tableId: 'vacanciesData'
     }}
diff --git a/plugins/recruit-resources/src/index.ts b/plugins/recruit-resources/src/index.ts
index 1b870990b4b..d6494cc8717 100644
--- a/plugins/recruit-resources/src/index.ts
+++ b/plugins/recruit-resources/src/index.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 //
 
+import contact from '@hcengineering/contact'
 import {
   toIdMap,
   type Client,
@@ -24,14 +25,14 @@ import {
   type RelatedDocument
 } from '@hcengineering/core'
 import { OK, Severity, Status, type Resources } from '@hcengineering/platform'
-import { createQuery, getClient, type ObjectSearchResult } from '@hcengineering/presentation'
+import { getClient, type ObjectSearchResult } from '@hcengineering/presentation'
 import { type Applicant, type Candidate, type Vacancy } from '@hcengineering/recruit'
-import contact from '@hcengineering/contact'
 import task from '@hcengineering/task'
 import { showPopup } from '@hcengineering/ui'
 import { type Filter } from '@hcengineering/view'
 import { FilterQuery, statusStore } from '@hcengineering/view-resources'
 import ApplicantFilter from './components/ApplicantFilter.svelte'
+import ApplicantNamePresenter from './components/ApplicantNamePresenter.svelte'
 import ApplicationItem from './components/ApplicationItem.svelte'
 import ApplicationPresenter from './components/ApplicationPresenter.svelte'
 import Applications from './components/Applications.svelte'
@@ -64,7 +65,6 @@ import Opinions from './components/review/Opinions.svelte'
 import OpinionsPresenter from './components/review/OpinionsPresenter.svelte'
 import ReviewPresenter from './components/review/ReviewPresenter.svelte'
 import Reviews from './components/review/Reviews.svelte'
-import ApplicantNamePresenter from './components/ApplicantNamePresenter.svelte'
 import recruit from './plugin'
 import {
   getAppIdentifier,
@@ -293,33 +293,6 @@ export function hideDoneState (value: any, query: DocumentQuery<Doc>): DocumentQ
   return query
 }
 
-const activeVacancyQuery = createQuery(true)
-
-let activeVacancies: Promise<Array<Ref<Vacancy>>> | Array<Ref<Vacancy>> | undefined
-
-export async function hideArchivedVacancies (value: any, query: DocumentQuery<Doc>): Promise<DocumentQuery<Doc>> {
-  if (activeVacancies === undefined) {
-    activeVacancies = new Promise<Array<Ref<Vacancy>>>((resolve) => {
-      activeVacancyQuery.query(
-        recruit.class.Vacancy,
-        { archived: { $ne: true } },
-        (res) => {
-          activeVacancies = res.map((it) => it._id)
-          resolve(activeVacancies)
-        },
-        { projection: { _id: 1 } }
-      )
-    })
-  }
-  if (value as boolean) {
-    if (activeVacancies instanceof Promise) {
-      activeVacancies = await activeVacancies
-    }
-    return { ...query, space: { $in: activeVacancies } }
-  }
-  return query
-}
-
 export async function applicantHasEmail (doc: Doc | Doc[] | undefined): Promise<boolean> {
   if (doc === undefined) return false
   const client = getClient()
@@ -415,7 +388,6 @@ export default async (): Promise<Resources> => ({
     GetObjectLinkFragment: getSequenceLink,
     GetIdObjectLinkFragment: getObjectLink,
     HideDoneState: hideDoneState,
-    HideArchivedVacancies: hideArchivedVacancies,
     ApplicantHasEmail: applicantHasEmail,
     ParseLinkId: parseLinkId
   },
diff --git a/plugins/task-resources/src/components/TypesView.svelte b/plugins/task-resources/src/components/TypesView.svelte
index b6c59a36626..5187f78ca45 100644
--- a/plugins/task-resources/src/components/TypesView.svelte
+++ b/plugins/task-resources/src/components/TypesView.svelte
@@ -13,13 +13,19 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, DocumentQuery, mergeQueries, Ref, Space, WithLookup } from '@hcengineering/core'
+  import { Class, Doc, DocumentQuery, FindOptions, mergeQueries, Ref, Space, WithLookup } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
   import { Project, ProjectType, ProjectTypeDescriptor } from '@hcengineering/task'
   import { AnyComponent, Button, Component, IconAdd, Loading, SearchInput, showPopup, Header } from '@hcengineering/ui'
   import { Viewlet, ViewletDescriptor, ViewletPreference, ViewOptions } from '@hcengineering/view'
-  import { FilterBar, FilterButton, ViewletSelector, ViewletSettingButton } from '@hcengineering/view-resources'
+  import {
+    FilterBar,
+    FilterButton,
+    getResultOptions,
+    ViewletSelector,
+    ViewletSettingButton
+  } from '@hcengineering/view-resources'
   import { selectedTaskTypeStore, selectedTypeStore, taskTypeStore } from '..'
   import task from '../plugin'
   import TypeSelector from './TypeSelector.svelte'
@@ -42,11 +48,24 @@
   let viewlets: WithLookup<Viewlet>[] = []
   let viewOptions: ViewOptions | undefined
 
+  let resultOptions = viewlet?.options
+
+  $: void getResultOptions(viewlet?.options ?? {}, viewlet?.viewOptions?.other, viewOptions).then((p) => {
+    resultOptions = p
+  })
+
   const spacesQ = createQuery()
   let spaces: Project[] = []
-  $: spacesQ.query(task.class.Project, { type: $selectedTypeStore as Ref<ProjectType> }, (result) => {
-    spaces = result
-  })
+  $: spacesQ.query<Project>(
+    task.class.Project,
+    { type: $selectedTypeStore as Ref<ProjectType> },
+    (result) => {
+      spaces = result
+    },
+    {
+      showArchived: resultOptions?.showArchived ?? false
+    }
+  )
   let resultQuery: DocumentQuery<Doc>
   $: query = { ...(baseQuery ?? {}), ...(viewlet?.baseQuery ?? {}), space: { $in: spaces.map((it) => it._id) } }
   $: searchQuery = search === '' ? query : { ...query, $search: search }
diff --git a/plugins/task-resources/src/components/kanban/KanbanView.svelte b/plugins/task-resources/src/components/kanban/KanbanView.svelte
index f9868b5bac9..2b6110accef 100644
--- a/plugins/task-resources/src/components/kanban/KanbanView.svelte
+++ b/plugins/task-resources/src/components/kanban/KanbanView.svelte
@@ -40,6 +40,7 @@
     getCategoryQueryProjection,
     getGroupByValues,
     getPresenter,
+    getResultOptions,
     groupBy,
     ListSelectionProvider,
     noCategory,
@@ -80,9 +81,11 @@
     resultQuery = mergeQueries(p, query)
   })
 
-  $: queryNoLookup = getCategoryQueryNoLookup(
-    mergeQueries(resultQuery, activeSpaces.length > 0 ? { space: { $in: activeSpaces } } : {})
-  )
+  $: void getResultOptions(options, viewOptionsConfig, viewOptions).then((p) => {
+    configOptions = p
+  })
+
+  $: queryNoLookup = getCategoryQueryNoLookup(resultQuery)
   const lookup: Lookup<Task> = {
     ...(options?.lookup ?? {}),
     space: task.class.Project,
@@ -91,7 +94,12 @@
       labels: tags.class.TagReference
     }
   }
-  $: resultOptions = { ...options, lookup, ...(orderBy !== undefined ? { sort: { [orderBy[0]]: orderBy[1] } } : {}) }
+  let configOptions = options
+  $: resultOptions = {
+    ...configOptions,
+    lookup,
+    ...(orderBy !== undefined ? { sort: { [orderBy[0]]: orderBy[1] } } : {})
+  }
 
   let kanbanUI: KanbanUI
   const listProvider = new ListSelectionProvider((offset: 1 | -1 | 0, of?: Doc, dir?: SelectDirection) => {
@@ -113,10 +121,8 @@
 
   let fastDocs: DocWithRank[] = []
   let slowDocs: DocWithRank[] = []
-  let activeSpaces: Ref<Project>[] = []
   const docsQuery = createQuery()
   const docsQuerySlow = createQuery()
-  const activeSpaceQuery = createQuery()
 
   let fastQueryIds = new Set<Ref<DocWithRank>>()
 
@@ -131,16 +137,7 @@
       ...getCategoryQueryProjection(client.getHierarchy(), _class, queryNoLookup, viewOptions.groupBy)
     }
   }
-  $: activeSpaceQuery.query(
-    task.class.Project,
-    {
-      archived: false
-    },
-    (res) => {
-      activeSpaces = res.map((r: Project) => r._id)
-    },
-    { projection: { _id: 1 } }
-  )
+
   $: docsQuery.query(
     _class,
     queryNoLookup,
diff --git a/plugins/tracker-resources/src/components/issues/Issues.svelte b/plugins/tracker-resources/src/components/issues/Issues.svelte
index a462cecdab8..26127bc8fe9 100644
--- a/plugins/tracker-resources/src/components/issues/Issues.svelte
+++ b/plugins/tracker-resources/src/components/issues/Issues.svelte
@@ -41,20 +41,7 @@
   let query: DocumentQuery<Issue> | undefined = undefined
   let modeSelectorProps: IModeSelector | undefined = undefined
 
-  const allProjectQuery = createQuery()
-  let allProjects: Pick<Project, '_id' | '_class' | 'archived'>[] = []
-
-  allProjectQuery.query(
-    tracker.class.Project,
-    {},
-    (res) => {
-      allProjects = res
-    },
-    { projection: { _id: 1, archived: 1 } }
-  )
-  $: spaceQuery = currentSpace
-    ? { space: currentSpace }
-    : { space: { $in: allProjects.filter((it) => !it.archived).map((it) => it._id) } }
+  $: spaceQuery = currentSpace !== undefined ? { space: currentSpace } : {}
 
   $: all = { ...baseQuery, ...spaceQuery }
 
diff --git a/plugins/tracker-resources/src/components/myissues/MyIssues.svelte b/plugins/tracker-resources/src/components/myissues/MyIssues.svelte
index eb6204584cf..ce38614637d 100644
--- a/plugins/tracker-resources/src/components/myissues/MyIssues.svelte
+++ b/plugins/tracker-resources/src/components/myissues/MyIssues.svelte
@@ -75,18 +75,6 @@
     { sort: { _id: 1 }, projection: { _id: 1 } }
   )
 
-  const allProjectQuery = createQuery()
-  let allProjects: Pick<Project, '_class' | '_id' | 'archived'>[] = []
-
-  allProjectQuery.query(
-    tracker.class.Project,
-    {},
-    (res) => {
-      allProjects = res
-    },
-    { projection: { _id: 1, archived: 1 } }
-  )
-
   $: queries = { assigned, active, backlog, created, subscribed }
   $: mode = $resolvedLocationStore.query?.mode ?? undefined
   $: if (mode === undefined || (queries as any)[mode] === undefined) {
@@ -94,9 +82,7 @@
   }
   $: if (mode !== undefined) {
     query = { ...(queries as any)[mode] }
-    if (query?.space === undefined) {
-      query = { ...query, space: { $in: allProjects.filter((it) => !it.archived).map((it) => it._id) } }
-    }
+
     modeSelectorProps = {
       config,
       mode,
diff --git a/plugins/view-resources/src/components/Table.svelte b/plugins/view-resources/src/components/Table.svelte
index 10ab2dcee5d..c14b6424458 100644
--- a/plugins/view-resources/src/components/Table.svelte
+++ b/plugins/view-resources/src/components/Table.svelte
@@ -28,7 +28,6 @@
     mergeQueries
   } from '@hcengineering/core'
   import notification from '@hcengineering/notification'
-  import { getResource } from '@hcengineering/platform'
   import { createQuery, getClient, reduceCalls, updateAttribute } from '@hcengineering/presentation'
   import ui, {
     Button,
@@ -41,20 +40,14 @@
     mouseAttractor,
     resizeObserver
   } from '@hcengineering/ui'
-  import {
-    AttributeModel,
-    BuildModelKey,
-    BuildModelOptions,
-    ViewOptionModel,
-    ViewOptions,
-    ViewQueryOption
-  } from '@hcengineering/view'
+  import { AttributeModel, BuildModelKey, BuildModelOptions, ViewOptionModel, ViewOptions } from '@hcengineering/view'
   import { deepEqual } from 'fast-equals'
   import { createEventDispatcher } from 'svelte'
   import { showMenu } from '../actions'
   import view from '../plugin'
   import { LoadingProps, buildConfigLookup, buildModel, restrictionStore } from '../utils'
   import IconUpDown from './icons/UpDown.svelte'
+  import { getResultOptions, getResultQuery } from '../viewOptions'
 
   export let _class: Ref<Class<Doc>>
   export let query: DocumentQuery<Doc>
@@ -128,28 +121,7 @@
       : { ...(options?.sort ?? {}), [sortKey]: sortOrder }
   }
 
-  async function getResultQuery (
-    query: DocumentQuery<Doc>,
-    viewOptions: ViewOptionModel[] | undefined,
-    viewOptionsStore: ViewOptions | undefined
-  ): Promise<DocumentQuery<Doc>> {
-    if (viewOptions === undefined || viewOptionsStore === undefined) {
-      return query
-    }
-    let result: DocumentQuery<Doc> = hierarchy.clone(query)
-    for (const viewOption of viewOptions) {
-      if (viewOption.actionTarget !== 'query') continue
-      const queryOption = viewOption as ViewQueryOption
-      const f = await getResource(queryOption.action)
-      const resultP = f(viewOptionsStore[queryOption.key] ?? queryOption.defaultValue, result)
-      if (resultP instanceof Promise) {
-        result = await resultP
-      } else {
-        result = resultP
-      }
-    }
-    return result
-  }
+  let resultOptions = options
 
   const update = reduceCalls(async function (
     _class: Ref<Class<Doc>>,
@@ -158,9 +130,9 @@
     sortOrder: SortingOrder,
     lookup: Lookup<Doc>,
     limit: number,
-    options?: FindOptions<Doc>
+    options: FindOptions<Doc> | undefined
   ) {
-    const p = await getResultQuery(query, viewOptionsConfig, viewOptions)
+    const p = await getResultQuery(hierarchy, query, viewOptionsConfig, viewOptions)
     const resultQuery = mergeQueries(p, query)
     loading += q.query(
       _class,
@@ -180,7 +152,11 @@
       ? 1
       : 0
   })
-  $: void update(_class, query, _sortKey, sortOrder, lookup, limit, options)
+  $: void update(_class, query, _sortKey, sortOrder, lookup, limit, resultOptions)
+
+  $: void getResultOptions(options, viewOptionsConfig, viewOptions).then((p) => {
+    resultOptions = p
+  })
 
   $: dispatch('content', objects)
 
@@ -194,7 +170,7 @@
         gtotal = total
       }
     },
-    { limit: 1, ...options, sort: getSort(_sortKey), lookup, total: true }
+    { limit: 1, ...resultOptions, sort: getSort(_sortKey), lookup, total: true }
   )
 
   const totalQueryQ = createQuery()
@@ -206,6 +182,7 @@
         gtotal = result.total === -1 ? 0 : result.total
       },
       {
+        ...resultOptions,
         lookup,
         limit: 1,
         total: true
@@ -300,7 +277,7 @@
     return getObjectValue(attribute.key, object)
   }
 
-  function onChange (value: any, doc: Doc, key: string, attribute: AnyAttribute) {
+  function onChange (value: any, doc: Doc, key: string, attribute: AnyAttribute): void {
     updateAttribute(client, doc, _class, { key, attr: attribute }, value)
   }
 
diff --git a/plugins/view-resources/src/components/filter/ObjectFilter.svelte b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
index 56895ac5dd8..95fbfb91750 100644
--- a/plugins/view-resources/src/components/filter/ObjectFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import core, {
+  import {
     Doc,
     FindResult,
     getObjectValue,
@@ -54,8 +54,8 @@
   const key = { key: tkey }
   const lookup = buildConfigLookup(hierarchy, filter.key._class, [tkey])
   const promise = getPresenter(client, filter.key._class, key, key, lookup)
-  filter.modes = filter.modes === undefined ? [view.filter.FilterObjectIn, view.filter.FilterObjectNin] : filter.modes
-  filter.mode = filter.mode === undefined ? filter.modes[0] : filter.mode
+  filter.modes = filter.modes ?? [view.filter.FilterObjectIn, view.filter.FilterObjectNin]
+  filter.mode = filter.mode ?? filter.modes[0]
 
   let values: Array<Doc | undefined | null> = []
   let objectsPromise: Promise<FindResult<Doc>> | undefined
@@ -85,12 +85,9 @@
         ? {
             space
           }
-        : { '$lookup.space.archived': false },
+        : {},
       {
         projection: { [filter.key.key]: 1 },
-        lookup: {
-          space: core.class.Space
-        },
         limit: 1000
       }
     )
@@ -100,20 +97,13 @@
       const extraObjects = await client.findAll(
         filter.key._class,
         {
-          ...(space !== undefined
-            ? { space }
-            : {
-                '$lookup.space.archived': false
-              }),
+          ...(space !== undefined ? { space } : {}),
           [filter.key.key]: {
             $nin: ninTarget
           }
         },
         {
-          projection: { [filter.key.key]: 1 },
-          lookup: {
-            space: core.class.Space
-          }
+          projection: { [filter.key.key]: 1 }
         }
       )
       baseObjects.push(...extraObjects)
@@ -128,7 +118,7 @@
     }
 
     const resultQuery =
-      search !== '' && clazz.filteringKey
+      search !== '' && clazz.filteringKey !== undefined
         ? {
             [clazz.filteringKey]: { $like: '%' + search + '%' },
             _id: { $in: Array.from(targets.keys()) }
@@ -186,7 +176,7 @@
     updateFilter()
   }
 
-  function updateFilter () {
+  function updateFilter (): void {
     clearTimeout(filterUpdateTimeout)
 
     filterUpdateTimeout = setTimeout(() => {
@@ -197,7 +187,7 @@
   let search: string = ''
 
   const dispatch = createEventDispatcher()
-  $: if (targetClass) getValues(search)
+  $: if (targetClass !== undefined) getValues(search)
 </script>
 
 <div class="selectPopup" use:resizeObserver={() => dispatch('changeContent')}>
diff --git a/plugins/view-resources/src/components/filter/ValueFilter.svelte b/plugins/view-resources/src/components/filter/ValueFilter.svelte
index 82f9dc8a424..0d77e78723c 100644
--- a/plugins/view-resources/src/components/filter/ValueFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ValueFilter.svelte
@@ -82,31 +82,20 @@
             [prefix + filter.key.key]: { $like: '%' + search + '%' }
           }
         : {}
-    const isDerivedFromSpace = hierarchy.isDerived(_class, core.class.Space)
 
     async function doQuery (limit: number | undefined, sortedValues: any[] | undefined): Promise<boolean> {
       const p = client.findAll(
         _class,
         {
           ...resultQuery,
-          ...(space !== undefined
-            ? { space }
-            : isDerivedFromSpace
-              ? viewOptions === undefined || viewOptions?.hideArchived === true
-                ? { archived: false }
-                : {}
-              : {
-                  '$lookup.space.archived': false
-                }),
+          ...(space !== undefined ? { space } : {}),
           ...(sortedValues !== undefined ? { [prefix + filter.key.key]: { $nin: sortedValues } } : {})
         },
         {
           sort: { modifiedOn: SortingOrder.Descending },
           projection: { [prefix + filter.key.key]: 1 },
           ...(limit !== undefined ? { limit } : {}),
-          lookup: {
-            space: core.class.Space
-          }
+          showArchived: viewOptions?.hideArchived === false
         }
       )
       if (limit !== undefined) {
diff --git a/plugins/view-resources/src/components/list/List.svelte b/plugins/view-resources/src/components/list/List.svelte
index 87e3c05fd06..893917e1e05 100644
--- a/plugins/view-resources/src/components/list/List.svelte
+++ b/plugins/view-resources/src/components/list/List.svelte
@@ -26,11 +26,19 @@
   import { IntlString, getResource } from '@hcengineering/platform'
   import { createQuery, getClient, reduceCalls } from '@hcengineering/presentation'
   import { AnyComponent, AnySvelteComponent } from '@hcengineering/ui'
-  import { BuildModelKey, ViewOptionModel, ViewOptions, ViewQueryOption, Viewlet } from '@hcengineering/view'
+  import {
+    BuildModelKey,
+    ViewOptionModel,
+    ViewOptions,
+    ViewOptionsOption,
+    ViewQueryOption,
+    Viewlet
+  } from '@hcengineering/view'
   import { createEventDispatcher } from 'svelte'
   import { SelectionFocusProvider } from '../../selection'
   import { buildConfigLookup } from '../../utils'
   import ListCategories from './ListCategories.svelte'
+  import { getResultOptions, getResultQuery } from '../../viewOptions'
 
   export let _class: Ref<Class<Doc>>
   export let space: Ref<Space> | undefined = undefined
@@ -68,12 +76,22 @@
   const docsQuerySlow = createQuery()
 
   $: lookup = buildConfigLookup(client.getHierarchy(), _class, config, options?.lookup)
-  $: resultOptions = { ...options, lookup, ...(orderBy !== undefined ? { sort: { [orderBy[0]]: orderBy[1] } } : {}) }
+  $: configOptions = options
+  $: resultOptions = {
+    ...configOptions,
+    lookup,
+    ...(orderBy !== undefined ? { sort: { [orderBy[0]]: orderBy[1] } } : {})
+  }
+
+  const updateOptions = reduceCalls(async function (options: FindOptions<Doc> | undefined, viewOptions: ViewOptions) {
+    configOptions = await getResultOptions(options, viewOptionsConfig, viewOptions)
+  })
+  $: void updateOptions(options, viewOptions)
 
   let resultQuery: DocumentQuery<Doc> = query
 
   const update = reduceCalls(async function (query: DocumentQuery<Doc>, viewOptions: ViewOptions) {
-    const p = await getResultQuery(query, viewOptionsConfig, viewOptions)
+    const p = await getResultQuery(hierarchy, query, viewOptionsConfig, viewOptions)
     resultQuery = mergeQueries(p, query)
   })
   $: void update(query, viewOptions)
@@ -163,27 +181,6 @@
 
   $: dispatch('content', docs)
 
-  async function getResultQuery (
-    query: DocumentQuery<Doc>,
-    viewOptions: ViewOptionModel[] | undefined,
-    viewOptionsStore: ViewOptions
-  ): Promise<DocumentQuery<Doc>> {
-    if (viewOptions === undefined) return query
-    let result: DocumentQuery<Doc> = hierarchy.clone(query)
-    for (const viewOption of viewOptions) {
-      if (viewOption.actionTarget !== 'query') continue
-      const queryOption = viewOption as ViewQueryOption
-      const f = await getResource(queryOption.action)
-      const resultP = f(viewOptionsStore[queryOption.key] ?? queryOption.defaultValue, result)
-      if (resultP instanceof Promise) {
-        result = await resultP
-      } else {
-        result = resultP
-      }
-    }
-    return result
-  }
-
   function uncheckAll (): void {
     dispatch('check', { docs, value: false })
     selectedObjectIds = []
diff --git a/plugins/view-resources/src/index.ts b/plugins/view-resources/src/index.ts
index 6f105fba5c0..542fc70aef4 100644
--- a/plugins/view-resources/src/index.ts
+++ b/plugins/view-resources/src/index.ts
@@ -129,7 +129,7 @@ import {
 } from './filter'
 
 import { AggregationMiddleware, AnalyticsMiddleware } from './middleware'
-import { showEmptyGroups } from './viewOptions'
+import { hideArchived, showEmptyGroups } from './viewOptions'
 import {
   canArchiveSpace,
   canDeleteObject,
@@ -321,6 +321,7 @@ export default async (): Promise<Resources> => ({
     FilterContainsResult: containsResult,
     FilterNestedMatchResult: nestedMatchResult,
     FilterNestedDontMatchResult: nestedDontMatchResult,
+    HideArchived: hideArchived,
     ShowEmptyGroups: showEmptyGroups,
     FilterDateOutdated: dateOutdated,
     FilterDateToday: dateToday,
diff --git a/plugins/view-resources/src/viewOptions.ts b/plugins/view-resources/src/viewOptions.ts
index 38eba416177..e56cd337f38 100644
--- a/plugins/view-resources/src/viewOptions.ts
+++ b/plugins/view-resources/src/viewOptions.ts
@@ -1,8 +1,19 @@
-import { type Class, type Doc, type DocumentQuery, type Ref, SortingOrder, type Space } from '@hcengineering/core'
+import {
+  type Class,
+  type Doc,
+  type DocumentQuery,
+  type FindOptions,
+  type Hierarchy,
+  type Ref,
+  SortingOrder,
+  type Space
+} from '@hcengineering/core'
 import { getResource } from '@hcengineering/platform'
 import { type LiveQuery, createQuery, getAttributePresenterClass, getClient } from '@hcengineering/presentation'
 import { locationToUrl, getCurrentResolvedLocation } from '@hcengineering/ui'
 import {
+  type ViewOptionsOption,
+  type ViewQueryOption,
   type DropdownViewOption,
   type Groupping,
   type ToggleViewOption,
@@ -128,6 +139,10 @@ export function migrateViewOpttions (): void {
   }
 }
 
+export function hideArchived (value: any, options: FindOptions<Doc> | undefined): FindOptions<Doc> {
+  return value === false ? { ...options, showArchived: true } : options ?? {}
+}
+
 export async function showEmptyGroups (
   _class: Ref<Class<Doc>>,
   query: DocumentQuery<Doc> | undefined,
@@ -190,3 +205,45 @@ export const CategoryQuery = {
 }
 
 export const viewOptionStore = writable(new Map<string, ViewOptions>())
+
+export async function getResultOptions<T extends Doc> (
+  options: FindOptions<T> | undefined,
+  viewOptions: ViewOptionModel[] | undefined,
+  viewOptionsStore: ViewOptions | undefined
+): Promise<FindOptions<T> | undefined> {
+  if (viewOptions === undefined || viewOptionsStore === undefined) {
+    return options
+  }
+  let result: FindOptions<T> = options !== undefined ? { ...options } : {}
+  for (const viewOption of viewOptions) {
+    if (viewOption.actionTarget !== 'options') continue
+    const queryOption = viewOption as ViewOptionsOption
+    const f = await getResource(queryOption.action)
+    result = f(viewOptionsStore[queryOption.key] ?? queryOption.defaultValue, result) as FindOptions<T>
+  }
+  return Object.keys(result).length > 0 ? result : undefined
+}
+
+export async function getResultQuery (
+  hierarchy: Hierarchy,
+  query: DocumentQuery<Doc>,
+  viewOptions: ViewOptionModel[] | undefined,
+  viewOptionsStore: ViewOptions | undefined
+): Promise<DocumentQuery<Doc>> {
+  if (viewOptions === undefined || viewOptionsStore === undefined) {
+    return query
+  }
+  let result: DocumentQuery<Doc> = hierarchy.clone(query)
+  for (const viewOption of viewOptions) {
+    if (viewOption.actionTarget !== 'query') continue
+    const queryOption = viewOption as ViewQueryOption
+    const f = await getResource(queryOption.action)
+    const resultP = f(viewOptionsStore[queryOption.key] ?? queryOption.defaultValue, result)
+    if (resultP instanceof Promise) {
+      result = await resultP
+    } else {
+      result = resultP
+    }
+  }
+  return result
+}
diff --git a/plugins/view/src/types.ts b/plugins/view/src/types.ts
index 15586de1f6d..b5064ab2a65 100644
--- a/plugins/view/src/types.ts
+++ b/plugins/view/src/types.ts
@@ -697,9 +697,25 @@ export interface ViewOption {
   defaultValue: any
   label: IntlString
   hidden?: (viewOptions: ViewOptions) => boolean
-  actionTarget?: 'query' | 'category' | 'display'
+  actionTarget?: 'query' | 'category' | 'display' | 'options'
   action?: Resource<(value: any, ...params: any) => any>
 }
+
+/**
+ * @public
+ */
+export type ViewOptionsAction<T extends Doc = Doc> = Resource<
+(value: any, query: FindOptions<T> | undefined) => FindOptions<T>
+>
+
+/**
+ * @public
+ */
+export interface ViewOptionsOption extends ViewOption {
+  actionTarget: 'options'
+  action: ViewOptionsAction<Doc>
+}
+
 /**
  * @public
  */
diff --git a/plugins/workbench-resources/src/components/Navigator.svelte b/plugins/workbench-resources/src/components/Navigator.svelte
index 10b72261af5..78f2088a4b8 100644
--- a/plugins/workbench-resources/src/components/Navigator.svelte
+++ b/plugins/workbench-resources/src/components/Navigator.svelte
@@ -81,7 +81,7 @@
 
   let requestIndex = 0
   async function update (model: NavigatorModel, spaces: Space[], preferences: Map<Ref<Doc>, SpacePreference>) {
-    shownSpaces = spaces.filter((sp) => !sp.archived && !preferences.has(sp._id))
+    shownSpaces = spaces.filter((sp) => !preferences.has(sp._id))
     starred = spaces.filter((sp) => preferences.has(sp._id))
     if (model.specials !== undefined) {
       const [sp, resIndex] = await updateSpecials(model.specials, spaces, ++requestIndex)
diff --git a/plugins/workbench-resources/src/components/SpecialView.svelte b/plugins/workbench-resources/src/components/SpecialView.svelte
index 170c95e0157..56d8a6d585c 100644
--- a/plugins/workbench-resources/src/components/SpecialView.svelte
+++ b/plugins/workbench-resources/src/components/SpecialView.svelte
@@ -13,32 +13,31 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { onDestroy } from 'svelte'
-  import { Class, Doc, DocumentQuery, Ref, Space, WithLookup } from '@hcengineering/core'
-  import { IntlString, Asset, getResource } from '@hcengineering/platform'
+  import { Class, Doc, DocumentQuery, FindOptions, Ref, Space, WithLookup } from '@hcengineering/core'
+  import { Asset, IntlString } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
   import {
     AnyComponent,
+    Breadcrumb,
     Button,
     Component,
+    Header,
     IconAdd,
     IModeSelector,
     Loading,
     ModeSelector,
     SearchInput,
-    showPopup,
-    Header,
-    Breadcrumb
+    showPopup
   } from '@hcengineering/ui'
+  import { Viewlet, ViewletDescriptor, ViewletPreference, ViewOptions } from '@hcengineering/view'
   import {
-    ViewOptionModel,
-    ViewOptions,
-    ViewQueryOption,
-    Viewlet,
-    ViewletDescriptor,
-    ViewletPreference
-  } from '@hcengineering/view'
-  import { FilterBar, FilterButton, ViewletSelector, ViewletSettingButton } from '@hcengineering/view-resources'
+    FilterBar,
+    FilterButton,
+    getResultOptions,
+    getResultQuery,
+    ViewletSelector,
+    ViewletSettingButton
+  } from '@hcengineering/view-resources'
   import { ParentsNavigationModel } from '@hcengineering/workbench'
 
   import ComponentNavigator from './ComponentNavigator.svelte'
@@ -74,7 +73,18 @@
   $: searchQuery = search === '' ? query : { ...query, $search: search }
   $: resultQuery = searchQuery
 
+  let options = viewlet?.options
+
   $: void updateQuery(_baseQuery, viewOptions, viewlet)
+  $: void updateOptions(viewlet?.options, viewOptions, viewlet)
+
+  async function updateOptions (
+    _options: FindOptions<Doc> | undefined,
+    viewOptions: ViewOptions | undefined,
+    viewlet: Viewlet | undefined
+  ): Promise<void> {
+    options = await getResultOptions(_options, viewlet?.viewOptions?.other, viewOptions)
+  }
 
   async function updateQuery (
     initialQuery: DocumentQuery<Doc>,
@@ -83,31 +93,10 @@
   ): Promise<void> {
     query =
       viewOptions !== undefined && viewlet !== undefined
-        ? await getViewQuery(initialQuery, viewOptions, viewlet.viewOptions?.other)
+        ? await getResultQuery(hierarchy, initialQuery, viewlet.viewOptions?.other, viewOptions)
         : initialQuery
   }
 
-  async function getViewQuery (
-    query: DocumentQuery<Doc>,
-    viewOptions: ViewOptions,
-    viewOptionsModel: ViewOptionModel[] | undefined
-  ): Promise<DocumentQuery<Doc>> {
-    if (viewOptionsModel === undefined) return query
-    let result: DocumentQuery<Doc> = hierarchy.clone(query)
-    for (const viewOption of viewOptionsModel) {
-      if (viewOption.actionTarget !== 'query') continue
-      const queryOption = viewOption as ViewQueryOption
-      const f = await getResource(queryOption.action)
-      const resultP = f(viewOptions[queryOption.key] ?? queryOption.defaultValue, result)
-      if (resultP instanceof Promise) {
-        result = await resultP
-      } else {
-        result = resultP
-      }
-    }
-    return result
-  }
-
   function showCreateDialog (): void {
     if (createComponent === undefined) return
     showPopup(createComponent, { ...createComponentProps, space }, 'top')
@@ -187,7 +176,7 @@
       props={{
         _class,
         space,
-        options: viewlet.options,
+        options,
         config: preference?.config ?? viewlet.config,
         viewlet,
         viewOptions,
@@ -207,7 +196,7 @@
       mainComponentProps={{
         _class,
         space,
-        options: viewlet.options,
+        options,
         config: preference?.config ?? viewlet.config,
         viewlet,
         viewOptions,
diff --git a/server/middleware/src/spaceSecurity.ts b/server/middleware/src/spaceSecurity.ts
index 5cbe8796272..e91cab40623 100644
--- a/server/middleware/src/spaceSecurity.ts
+++ b/server/middleware/src/spaceSecurity.ts
@@ -55,7 +55,7 @@ import {
   type PipelineContext
 } from '@hcengineering/server-core'
 import { isOwner, isSystem } from './utils'
-type SpaceWithMembers = Pick<Space, '_id' | 'members' | 'private' | '_class'>
+type SpaceWithMembers = Pick<Space, '_id' | 'members' | 'private' | '_class' | 'archived'>
 
 /**
  * @public
@@ -133,6 +133,7 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
               {},
               {
                 projection: {
+                  archived: 1,
                   private: 1,
                   _class: 1,
                   _id: 1,
@@ -433,10 +434,14 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
     await this.next?.handleBroadcast(ctx)
   }
 
-  private getAllAllowedSpaces (account: Account, isData: boolean): Ref<Space>[] {
+  private getAllAllowedSpaces (account: Account, isData: boolean, showArchived: boolean): Ref<Space>[] {
     const userSpaces = this.allowedSpaces[account._id] ?? []
     const res = [...userSpaces, account._id as string as Ref<Space>, ...this.systemSpaces, ...this.mainSpaces]
-    return isData ? res : [...res, ...this.publicSpaces]
+    const unfilteredRes = isData ? res : [...res, ...this.publicSpaces]
+    if (showArchived) {
+      return unfilteredRes
+    }
+    return unfilteredRes.filter((p) => this.spacesMap.get(p)?.archived !== true)
   }
 
   async getDomainSpaces (ctx: MeasureContext, domain: Domain): Promise<Set<Ref<Space>>> {
@@ -471,9 +476,10 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
     account: Account,
     query: ObjQueryType<T['space']>,
     domain: Domain,
-    isSpace: boolean
+    isSpace: boolean,
+    showArchived: boolean
   ): Promise<ObjQueryType<T['space']> | undefined> {
-    const spaces = await this.filterByDomain(ctx, domain, this.getAllAllowedSpaces(account, !isSpace))
+    const spaces = await this.filterByDomain(ctx, domain, this.getAllAllowedSpaces(account, !isSpace, showArchived))
     if (query == null) {
       if (spaces.allDomainSpaces) {
         return undefined
@@ -520,13 +526,14 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
     const account = ctx.contextData.account
     const isSpace = this.context.hierarchy.isDerived(_class, core.class.Space)
     const field = this.getKey(domain)
+    const showArchived: boolean = options?.showArchived ?? false
 
     let clientFilterSpaces: Set<Ref<Space>> | undefined
 
     if (!isSystem(account, ctx) && account.role !== AccountRole.DocGuest && domain !== DOMAIN_MODEL) {
-      if (!isOwner(account, ctx) || !isSpace) {
+      if (!isOwner(account, ctx) || !isSpace || !showArchived) {
         if (query[field] !== undefined) {
-          const res = await this.mergeQuery(ctx, account, query[field], domain, isSpace)
+          const res = await this.mergeQuery(ctx, account, query[field], domain, isSpace, showArchived)
           if (res === undefined) {
             // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
             delete newQuery[field]
@@ -539,7 +546,11 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
             }
           }
         } else {
-          const spaces = await this.filterByDomain(ctx, domain, this.getAllAllowedSpaces(account, !isSpace))
+          const spaces = await this.filterByDomain(
+            ctx,
+            domain,
+            this.getAllAllowedSpaces(account, !isSpace, showArchived)
+          )
           if (spaces.allDomainSpaces) {
             // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
             delete newQuery[field]
@@ -581,7 +592,7 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
       if (options?.lookup !== undefined) {
         for (const object of findResult) {
           if (object.$lookup !== undefined) {
-            this.filterLookup(ctx, object.$lookup)
+            this.filterLookup(ctx, object.$lookup, showArchived)
           }
         }
       }
@@ -598,7 +609,7 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
     const newQuery = { ...query }
     const account = ctx.contextData.account
     if (!isSystem(account, ctx)) {
-      const allSpaces = this.getAllAllowedSpaces(account, true)
+      const allSpaces = this.getAllAllowedSpaces(account, true, false)
       if (query.classes !== undefined) {
         const res = new Set<Ref<Space>>()
         const passedDomains = new Set<string>()
@@ -622,11 +633,11 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
     return result
   }
 
-  filterLookup<T extends Doc>(ctx: MeasureContext, lookup: LookupData<T>): void {
+  filterLookup<T extends Doc>(ctx: MeasureContext, lookup: LookupData<T>, showArchived: boolean): void {
     if (Object.keys(lookup).length === 0) return
     const account = ctx.contextData.account
     if (isSystem(account, ctx)) return
-    const allowedSpaces = new Set(this.getAllAllowedSpaces(account, true))
+    const allowedSpaces = new Set(this.getAllAllowedSpaces(account, true, showArchived))
     for (const key in lookup) {
       const val = lookup[key]
       if (Array.isArray(val)) {
diff --git a/server/middleware/src/utils.ts b/server/middleware/src/utils.ts
index deeec458553..5e75aebab48 100644
--- a/server/middleware/src/utils.ts
+++ b/server/middleware/src/utils.ts
@@ -30,7 +30,7 @@ export function isOwner (account: Account, ctx: MeasureContext<SessionData>): bo
 }
 
 export function isSystem (account: Account, ctx: MeasureContext<SessionData>): boolean {
-  return account._id === core.account.System || ctx.contextData.admin === true
+  return account._id === core.account.System
 }
 
 export function filterBroadcastOnly (tx: Tx[], hierarchy: Hierarchy): Tx[] {
diff --git a/server/postgres/src/storage.ts b/server/postgres/src/storage.ts
index e8b3c4fe793..4e521d6e15d 100644
--- a/server/postgres/src/storage.ts
+++ b/server/postgres/src/storage.ts
@@ -669,7 +669,8 @@ abstract class PostgresAdapterBase implements DbAdapter {
           // Add workspace name as $1
 
           const select = `SELECT ${this.getProjection(domain, options?.projection, joins, options?.associations)} FROM ${domain}`
-          const secJoin = this.addSecurity(vars, query, domain, ctx.contextData)
+          const showArchived = options?.showArchived ?? false
+          const secJoin = this.addSecurity(vars, query, showArchived, domain, ctx.contextData)
           if (secJoin !== undefined) {
             sqlChunks.push(secJoin)
           }
@@ -729,6 +730,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
   addSecurity<T extends Doc>(
     vars: ValuesVariables,
     query: DocumentQuery<T>,
+    showArchived: boolean,
     domain: string,
     sessionContext: SessionData
   ): string | undefined {
@@ -742,7 +744,8 @@ abstract class PostgresAdapterBase implements DbAdapter {
         if (domain === DOMAIN_SPACE && isOwner(acc)) return
         const key = domain === DOMAIN_SPACE ? '_id' : domain === DOMAIN_TX ? "data ->> 'objectSpace'" : 'space'
         const privateCheck = domain === DOMAIN_SPACE ? ' OR sec.private = false' : ''
-        const q = `(sec.members @> '{"${acc._id}"}' OR sec."_class" = '${core.class.SystemSpace}'${privateCheck})`
+        const archivedCheck = showArchived ? '' : ' AND sec.archived = false'
+        const q = `(sec.members @> '{"${acc._id}"}' OR sec."_class" = '${core.class.SystemSpace}'${privateCheck})${archivedCheck}`
         return `INNER JOIN ${translateDomain(DOMAIN_SPACE)} AS sec ON sec._id = ${domain}.${key} AND sec."workspaceId" = ${vars.add(this.workspaceId.name, '::uuid')} AND ${q}`
       }
     }