diff --git a/plugins/chunter-resources/src/components/AttachmentPopup.svelte b/plugins/chunter-resources/src/components/AttachmentPopup.svelte
index d161bb53a9..d4ac756c56 100644
--- a/plugins/chunter-resources/src/components/AttachmentPopup.svelte
+++ b/plugins/chunter-resources/src/components/AttachmentPopup.svelte
@@ -15,19 +15,18 @@
 -->
 
 <script lang="ts">
-  import type { Bag } from '@anticrm/core'
-  import type { Attachment } from '@anticrm/chunter'
+  import type { Ref, Doc } from '@anticrm/core'
   import { Table } from '@anticrm/view-resources'
 
   import chunter from '@anticrm/chunter'
 
-  export let files: Bag<Attachment>
+  export let objectId: Ref<Doc>
 
 </script>
 
 <Table 
-_class={chunter.class.Attachment}
-config={['', 'lastModified']}
-options={ {} }
-search=""
+  _class={chunter.class.Attachment}
+  config={['', 'lastModified']}
+  options={ {} }
+  query={ { attachedTo: objectId } }
 />
diff --git a/plugins/chunter-resources/src/components/AttachmentsPresenter.svelte b/plugins/chunter-resources/src/components/AttachmentsPresenter.svelte
index 409626b9d5..c8be496409 100644
--- a/plugins/chunter-resources/src/components/AttachmentsPresenter.svelte
+++ b/plugins/chunter-resources/src/components/AttachmentsPresenter.svelte
@@ -34,7 +34,7 @@
 {/if} -->
 
 {#if value.attachments && value.attachments > 0}
-  <Tooltip label={'Attachments (' + value.attachments + ')'} component={AttachmentPopup} props={{ files: value._id }}>
+  <Tooltip label={'Attachments (' + value.attachments + ')'} component={AttachmentPopup} props={{ objectId: value._id }}>
     <div class="sm-tool-icon">
       <span class="icon"><IconAttachment size="small"/></span>{value.attachments}
     </div>
diff --git a/plugins/recruit-resources/src/components/ApplicationsPopup.svelte b/plugins/recruit-resources/src/components/ApplicationsPopup.svelte
index 110de4d326..18f603b2b0 100644
--- a/plugins/recruit-resources/src/components/ApplicationsPopup.svelte
+++ b/plugins/recruit-resources/src/components/ApplicationsPopup.svelte
@@ -41,5 +41,5 @@
       }
     }
   }
-  search=""
+  query={ { candidate: value._id } }
 />
diff --git a/plugins/recruit-resources/src/components/Attachments.svelte b/plugins/recruit-resources/src/components/Attachments.svelte
index 8105fac942..e74b4db08f 100644
--- a/plugins/recruit-resources/src/components/Attachments.svelte
+++ b/plugins/recruit-resources/src/components/Attachments.svelte
@@ -84,7 +84,7 @@
     _class={chunter.class.Attachment}
     config={['', 'lastModified']}
     options={ {} }
-    search=""
+    query={ { attachedTo: objectId } }
   />
 </div>
 
diff --git a/plugins/recruit-resources/src/components/EditCandidate.svelte b/plugins/recruit-resources/src/components/EditCandidate.svelte
index 1479c664c9..fe238e10be 100644
--- a/plugins/recruit-resources/src/components/EditCandidate.svelte
+++ b/plugins/recruit-resources/src/components/EditCandidate.svelte
@@ -102,7 +102,7 @@
           }
         }
       }
-      search=""
+      query={ { candidate: _id } }
     />
   </div>
 
diff --git a/plugins/view-resources/src/components/Table.svelte b/plugins/view-resources/src/components/Table.svelte
index 3052bdb786..34010e7ab9 100644
--- a/plugins/view-resources/src/components/Table.svelte
+++ b/plugins/view-resources/src/components/Table.svelte
@@ -15,7 +15,7 @@
 -->
 
 <script lang="ts">
-  import type { Ref, Class, Doc, Space, FindOptions } from '@anticrm/core'
+  import type { Ref, Class, Doc, Space, FindOptions, DocumentQuery } from '@anticrm/core'
   import { SortingOrder } from '@anticrm/core'
   import { buildModel } from '../utils'
   import { getClient } from '@anticrm/presentation'
@@ -26,10 +26,9 @@
   import { createQuery } from '@anticrm/presentation'
 
   export let _class: Ref<Class<Doc>>
-  export let space: Ref<Space>
+  export let query: DocumentQuery<Doc>
   export let options: FindOptions<Doc> | undefined
   export let config: string[]
-  export let search: string
 
   let sortKey = 'modifiedOn'
   let sortOrder = SortingOrder.Descending
@@ -37,8 +36,8 @@
 
   let objects: Doc[]
 
-  const query = createQuery()
-  $: query.query(_class, search === '' ? (space ? { space } : {}) : { $search: search }, result => { objects = result }, { sort: { [sortKey]: sortOrder }, ...options })
+  const q = createQuery()
+  $: q.query(_class, query, result => { objects = result }, { sort: { [sortKey]: sortOrder }, ...options })
 
   function getValue(doc: Doc, key: string): any {
     if (key.length === 0)
diff --git a/plugins/view-resources/src/components/TableView.svelte b/plugins/view-resources/src/components/TableView.svelte
index 7dfd28ad0e..63d560669b 100644
--- a/plugins/view-resources/src/components/TableView.svelte
+++ b/plugins/view-resources/src/components/TableView.svelte
@@ -39,7 +39,7 @@
   let objects: Doc[]
 
   const query = createQuery()
-  $: query.query(_class, search === '' ? (space ? { space } : {}) : { $search: search }, result => { objects = result }, { sort: { [sortKey]: sortOrder }, ...options })
+  $: query.query(_class, search === '' ? { space } : { $search: search }, result => { objects = result }, { sort: { [sortKey]: sortOrder }, ...options })
 
   function getValue(doc: Doc, key: string): any {
     if (key.length === 0)