diff --git a/plugins/process-resources/src/components/ProcessAttribute.svelte b/plugins/process-resources/src/components/ProcessAttribute.svelte
index 03b645db85..7ea3acdbbf 100644
--- a/plugins/process-resources/src/components/ProcessAttribute.svelte
+++ b/plugins/process-resources/src/components/ProcessAttribute.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { MasterTag, Tag } from '@hcengineering/card'
   import { AnyAttribute, Class, Doc, Ref } from '@hcengineering/core'
-  import { Context, createDSLContext, parseContext, Process, SelectedContext } from '@hcengineering/process'
+  import { Context, createContext, parseContext, Process, SelectedContext } from '@hcengineering/process'
   import {
     AnySvelteComponent,
     Button,
@@ -72,11 +72,7 @@
     if (res === null) {
       value = undefined
     } else {
-      try {
-        value = createDSLContext(res)
-      } catch {
-        value = '$' + JSON.stringify(res)
-      }
+      value = createContext(res)
     }
     dispatch('change', value)
   }
diff --git a/plugins/process-resources/src/components/contextEditors/ToDoContextSelector.svelte b/plugins/process-resources/src/components/contextEditors/ToDoContextSelector.svelte
index 86808e18e7..98d460e04f 100644
--- a/plugins/process-resources/src/components/contextEditors/ToDoContextSelector.svelte
+++ b/plugins/process-resources/src/components/contextEditors/ToDoContextSelector.svelte
@@ -16,6 +16,7 @@
   import { getClient } from '@hcengineering/presentation'
   import {
     ContextId,
+    createContext,
     MethodParams,
     parseContext,
     Process,
@@ -115,15 +116,13 @@
       eventToHTMLElement(ev),
       (result) => {
         if (result !== undefined) {
-          dispatch(
-            'change',
-            '$' +
-              JSON.stringify({
-                type: 'context',
-                id: result as ContextId,
-                key: ''
-              })
-          )
+          const ctx: SelectedExecutionContext = {
+            type: 'context',
+            id: result as ContextId,
+            key: ''
+          }
+          const res = createContext(ctx)
+          dispatch('change', res)
         }
       }
     )
diff --git a/plugins/process-resources/src/components/criterias/ArraySizeCriteria.svelte b/plugins/process-resources/src/components/criterias/ArraySizeCriteria.svelte
index dc4142ff4b..340e7048d1 100644
--- a/plugins/process-resources/src/components/criterias/ArraySizeCriteria.svelte
+++ b/plugins/process-resources/src/components/criterias/ArraySizeCriteria.svelte
@@ -16,7 +16,7 @@
 <script lang="ts">
   import core, { AnyAttribute } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
-  import { parseContext, Process, SelectedContext } from '@hcengineering/process'
+  import { createContext, parseContext, Process, SelectedContext } from '@hcengineering/process'
   import { Button, Component, eventToHTMLElement, IconAdd, IconClose, showPopup } from '@hcengineering/ui'
   import view from '@hcengineering/view-resources/src/plugin'
   import { createEventDispatcher } from 'svelte'
@@ -51,7 +51,7 @@
   }
 
   function onSelect (res: SelectedContext | null): void {
-    val = res === null ? undefined : '$' + JSON.stringify(res)
+    val = res === null ? undefined : createContext(res)
     dispatch('change', val)
   }
 
diff --git a/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte b/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte
index 0cd0eee6c5..1e92d3a70c 100644
--- a/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte
+++ b/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte
@@ -16,7 +16,7 @@
 <script lang="ts">
   import { AnyAttribute } from '@hcengineering/core'
   import { findAttributeEditor, getAttributePresenterClass, getClient } from '@hcengineering/presentation'
-  import { Context, parseContext, Process, SelectedContext } from '@hcengineering/process'
+  import { Context, createContext, parseContext, Process, SelectedContext } from '@hcengineering/process'
   import { Button, Component, eventToHTMLElement, IconAdd, IconClose, showPopup } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import ContextSelectorPopup from '../attributeEditors/ContextSelectorPopup.svelte'
@@ -47,7 +47,7 @@
   }
 
   function onSelect (res: SelectedContext | null): void {
-    val = res === null ? undefined : '$' + JSON.stringify(res)
+    val = res === null ? undefined : createContext(res)
     dispatch('change', val)
   }
 
diff --git a/plugins/process-resources/src/components/criterias/RangeCriteria.svelte b/plugins/process-resources/src/components/criterias/RangeCriteria.svelte
index 62c7c08022..1f5932c2ed 100644
--- a/plugins/process-resources/src/components/criterias/RangeCriteria.svelte
+++ b/plugins/process-resources/src/components/criterias/RangeCriteria.svelte
@@ -16,7 +16,7 @@
 <script lang="ts">
   import { AnyAttribute } from '@hcengineering/core'
   import { findAttributeEditor, getAttributePresenterClass, getClient } from '@hcengineering/presentation'
-  import { Context, parseContext, Process, SelectedContext } from '@hcengineering/process'
+  import { Context, createContext, parseContext, Process, SelectedContext } from '@hcengineering/process'
   import { Button, Component, eventToHTMLElement, IconAdd, IconClose, showPopup } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import ContextSelectorPopup from '../attributeEditors/ContextSelectorPopup.svelte'
@@ -52,7 +52,7 @@
   }
 
   function onSelect (res: SelectedContext | null, index: number): void {
-    val[index] = res === null ? undefined : '$' + JSON.stringify(res)
+    val[index] = res === null ? undefined : createContext(res)
     dispatch('change', val)
   }
 
diff --git a/plugins/process-resources/src/utils.ts b/plugins/process-resources/src/utils.ts
index 4d0da0d64c..195eae156e 100644
--- a/plugins/process-resources/src/utils.ts
+++ b/plugins/process-resources/src/utils.ts
@@ -33,6 +33,7 @@ import { getClient } from '@hcengineering/presentation'
 import {
   type Context,
   type ContextId,
+  createContext,
   type Execution,
   type ExecutionContext,
   ExecutionStatus,
@@ -564,7 +565,7 @@ export function getToDoEndAction (prevState: State): Step<Doc> {
     params: {
       state: prevState._id,
       title: prevState.title,
-      user: '$' + JSON.stringify(context)
+      user: createContext(context)
     }
   }
   return endAction
diff --git a/plugins/process/src/dslContext.ts b/plugins/process/src/dslContext.ts
index c1f57ecdde..274d2623ef 100644
--- a/plugins/process/src/dslContext.ts
+++ b/plugins/process/src/dslContext.ts
@@ -12,6 +12,14 @@ import {
   SelectedUserRequest
 } from './types'
 
+export function createContext (context: SelectedContext): string {
+  try {
+    return createDSLContext(context)
+  } catch {
+    return '$' + JSON.stringify(context)
+  }
+}
+
 export function createDSLContext (context: SelectedContext): string {
   let expression = ''
   switch (context.type) {