diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
index 57542cdaa8..422b9a384c 100644
--- a/models/tracker/src/index.ts
+++ b/models/tracker/src/index.ts
@@ -319,6 +319,10 @@ export function createModel (builder: Builder): void {
   const boardId = 'board'
   const projectsId = 'projects'
 
+  builder.mixin(tracker.class.Issue, core.class.Class, view.mixin.AttributePresenter, {
+    presenter: tracker.component.IssuePresenter
+  })
+
   builder.mixin(tracker.class.TypeIssuePriority, core.class.Class, view.mixin.AttributePresenter, {
     presenter: tracker.component.PriorityPresenter
   })
diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json
index 37a85a0112..85fcd90d04 100644
--- a/plugins/tracker-assets/lang/en.json
+++ b/plugins/tracker-assets/lang/en.json
@@ -69,7 +69,8 @@
     "ChangeParent": "Change parent issue\u2026",
     "RemoveParent": "Remove parent issue",
     "OpenParent": "Open parent issue",
-    "SubIssues": "Sub-issues ({subIssues})",
+    "SubIssues": "Sub-issues",
+    "SubIssuesList": "Sub-issues ({subIssues})",
     "OpenSubIssues": "Open sub-issues",
     "AddSubIssues": "{subIssues, plural, =1 {Add sub-issue} other {+ Add sub-issues}}",
     "BlockedBy": "",
diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json
index 91db78d1e8..ee48dc2f8c 100644
--- a/plugins/tracker-assets/lang/ru.json
+++ b/plugins/tracker-assets/lang/ru.json
@@ -43,7 +43,8 @@
     "Low": "Низкий",
     "Unassigned": "Не назначен",
     "AddIssueTooltip": "Добавить задачу\u2026",
-    "SubIssues": "Подзадачи ({subIssues})",
+    "SubIssues": "Подзадачи",
+    "SubIssuesList": "Подзадачи ({subIssues})",
     "OpenSubIssues": "Открыть подзадачи",
     "AddSubIssues": "{subIssues, plural, =1 {Добавить подзадачу} other {+ Добавить подзадачи}}",
 
diff --git a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte
index 613c06fb48..e61f82eee9 100644
--- a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte
@@ -13,31 +13,37 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { getClient } from '@anticrm/presentation'
+  import { createQuery, getClient } from '@anticrm/presentation'
   import type { Issue, Team } from '@anticrm/tracker'
   import { Icon, showPanel } from '@anticrm/ui'
   import tracker from '../../plugin'
 
   export let value: Issue
-  export let currentTeam: Team
+  export let currentTeam: Team | undefined
   export let inline: boolean = false
 
   const client = getClient()
+  const spaceQuery = createQuery()
   const shortLabel = client.getHierarchy().getClass(value._class).shortLabel
 
-  $: issueName = `${currentTeam.identifier}-${value.number}`
-
-  const handleIssuePreviewOpened = () => {
+  function handleIssueEditorOpened () {
     showPanel(tracker.component.EditIssue, value._id, value._class, 'content')
   }
+
+  $: if (!currentTeam) {
+    spaceQuery.query(tracker.class.Team, { _id: value.space }, (res) => ([currentTeam] = res))
+  }
+  $: issueName = currentTeam && `${currentTeam.identifier}-${value.number}`
 </script>
 
 {#if value && shortLabel}
-  <div class="flex-presenter issuePresenterRoot" class:inline-presenter={inline} on:click={handleIssuePreviewOpened}>
+  <div class="flex-presenter issuePresenterRoot" class:inline-presenter={inline} on:click={handleIssueEditorOpened}>
     <div class="icon">
       <Icon icon={tracker.icon.Issue} size={'small'} />
     </div>
-    <span title={issueName} class="label nowrap issueLabel">{issueName}</span>
+    {#if issueName !== undefined}
+      <span title={issueName} class="label nowrap issueLabel">{issueName}</span>
+    {/if}
   </div>
 {/if}
 
diff --git a/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte b/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte
index bd5738ed58..0693398c6a 100644
--- a/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte
@@ -86,8 +86,12 @@
       </span>
     </div>
     <div class="flex-center">
-      <ProjectEditor value={issue} />
-      <DueDateEditor value={issue} />
+      {#if issue.project !== null}
+        <ProjectEditor value={issue} />
+      {/if}
+      {#if issue.dueDate !== null}
+        <DueDateEditor value={issue} />
+      {/if}
       <AssigneeEditor value={issue} />
     </div>
   </div>
diff --git a/plugins/tracker-resources/src/components/issues/edit/SubIssues.svelte b/plugins/tracker-resources/src/components/issues/edit/SubIssues.svelte
index ae7037fd69..a7c64027d9 100644
--- a/plugins/tracker-resources/src/components/issues/edit/SubIssues.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/SubIssues.svelte
@@ -58,7 +58,7 @@
       icon={isCollapsed ? Collapsed : Expanded}
       size="small"
       kind="transparent"
-      label={tracker.string.SubIssues}
+      label={tracker.string.SubIssuesList}
       labelParams={{ subIssues: issue.subIssues }}
       on:click={() => (isCollapsed = !isCollapsed)}
     />
@@ -97,11 +97,11 @@
 
 <style lang="scss">
   .list {
-    border-bottom: 1px solid var(--divider-color);
+    border-top: 1px solid var(--divider-color);
 
     &.collapsed {
-      margin-top: 1px;
-      border-bottom: none;
+      padding-top: 1px;
+      border-top: none;
     }
   }
 </style>
diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts
index e0c55cf569..2b3fa58837 100644
--- a/plugins/tracker-resources/src/plugin.ts
+++ b/plugins/tracker-resources/src/plugin.ts
@@ -87,6 +87,7 @@ export default mergeIds(trackerId, tracker, {
     AssignTo: '' as IntlString,
     AssignedTo: '' as IntlString,
     SubIssues: '' as IntlString,
+    SubIssuesList: '' as IntlString,
     SetParent: '' as IntlString,
     ChangeParent: '' as IntlString,
     RemoveParent: '' as IntlString,