diff --git a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte
index 6b85c2e..7f6b9aa 100644
--- a/src/routes/(angemeldet)/list/[vorgang]/+page.svelte
+++ b/src/routes/(angemeldet)/list/[vorgang]/+page.svelte
@@ -81,11 +81,11 @@
 							<div class="min-w-0 flex-auto">
 								<span
 								style="display: inline-block; min-width: 5px;"
-								id="{item.name}-label"
+								id="label__{item.name}"
 								class="text-sm font-semibold leading-6 text-gray-900"
 								contenteditable={! item.button}
 								on:focusout={(event) => {
-									let text_field_id = item.name + "-label"
+									let text_field_id = `label__${item.name}`
 
 									let text_field = document.getElementById(text_field_id)
 									text_field.setAttribute("contenteditable", false)
@@ -97,7 +97,7 @@
 								}}
 								on:keydown|stopPropagation={async (event) => {
 									if (event.key == "Escape") {
-										let text_field_id = item.name + "-label"
+										let text_field_id = `label__${item.name}`
 
 										let text_field = document.getElementById(text_field_id)
 										text_field.setAttribute("contenteditable", false)
@@ -131,7 +131,7 @@
 
 										let data_obj = {}
 										data_obj["new_name"] = new_name
-										data_obj["old_name"] = event.currentTarget.id.split('-')[0]
+										data_obj["old_name"] = event.currentTarget.id.split('__')[1]
 
 										const response = await fetch(url,
 											{method: 'PUT', body: JSON.stringify( data_obj )
@@ -156,9 +156,9 @@
 								{#if item.show_button}
 								<button
 								style="padding: 2px"
-								id="{item.name}-btn"
+								id="edit__{item.name}"
 								on:click|preventDefault={(ev) => {
-									let text_field_id = item.name + "-label"
+									let text_field_id = `label__${item.name}`
 
 									let text_field = document.getElementById(text_field_id)
 									text_field.setAttribute("contenteditable", true)
@@ -176,14 +176,14 @@
 								<!-- Delete button -->
 								<button
 								style="padding: 2px"
-								id="{item.name}-del"
+								id="del__{item.name}"
 								on:click|preventDefault={async (ev) => {
 									let delete_item = window.confirm("Bist du sicher?");
 
 									if (delete_item) {
 										// bucket: tatort, name: <vorgang>/item-name
 										let vorgang = $page.params.vorgang
-										let filename = event.currentTarget.id.split('-')[0]
+										let filename = event.currentTarget.id.split('del__')[1]