diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-other-value-modal.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-other-value-modal.vue
index 8a8e0357c8..ce54438630 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-other-value-modal.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-other-value-modal.vue
@@ -34,13 +34,13 @@
 					<template v-if="col.field === 'name'">
 						{{ data.name }}
 					</template>
-					<template v-if="col.field === 'target'">
-						{{ data.target }}
+					<template v-if="col.field === 'source'">
+						{{ data.source }}
 					</template>
 					<template v-if="col.field === 'expression'">
 						<section class="inline-flex gap-1">
 							<span class="value-label">Constants</span>
-							<span class="value">{{ numberToNist(data.expression) }}</span>
+							<span class="value">{{ numberToNist(data.expression) || data.expression }}</span>
 						</section>
 					</template>
 				</template>
@@ -114,7 +114,7 @@ const props = defineProps<{
 const otherValueList = ref(props.otherValueList);
 const columns = ref([
 	{ field: 'name', header: 'Configuration name' },
-	{ field: 'target', header: 'Source' },
+	{ field: 'source', header: 'Source' },
 	{ field: 'expression', header: 'Value' }
 ]);
 
@@ -131,13 +131,13 @@ const customSelection = ref(false);
 const selection = ref<null | { id?: string; source?: string; constant?: number }>(null);
 
 const onCustomSelectionChange = (val) => {
-	if (!val?.name) {
+	if (customSelection.value && !val?.name) {
 		selection.value =
 			numberType.value === numberOptions[0]
 				? { constant: customConstant.value, source: customSource.value }
 				: { constant: 0, source: '' };
 	} else {
-		selection.value = { constant: val.expression, source: customSource.value };
+		selection.value = { constant: val.expression, source: val.source };
 	}
 };
 
@@ -145,7 +145,7 @@ function getColumnWidth(columnField: string) {
 	switch (columnField) {
 		case 'name':
 			return 40;
-		case 'target':
+		case 'source':
 			return 20;
 		case 'expression':
 			return 100;
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-other-value-modal.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-other-value-modal.vue
index bd2377a1f3..c01b0fbaf3 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-other-value-modal.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-other-value-modal.vue
@@ -36,7 +36,7 @@
 							{{ data.name }}
 						</template>
 						<template v-if="col.field === 'source'">
-							{{ data.referenceId }}
+							{{ data.source }}
 						</template>
 						<tera-line-graphic
 							v-if="col.field === 'range'"