diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
index e5cf6b804e..7a0dda2b50 100644
--- a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
+++ b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
@@ -351,7 +351,7 @@
 
 
 
-        {#if config.freeform?.key && !(config?.mappings?.length > 0)}
+        {#if config.freeform?.key && !(config?.mappings?.filter(m => m.hideInAnswer != true)?.length > 0)}
           <!-- There are no options to choose from, simply show the input element: fill out the text field -->
           <FreeformInput
             {config}
@@ -504,7 +504,9 @@
               <TagHint {state} tags={selectedTags} currentProperties={$tags} />
               <span class="flex flex-wrap">
                 {#if $featureSwitchIsTesting}
+                  <button class="small" on:click={() => console.log("Configuration is ", config)}>
                   Testmode &nbsp;
+                  </button>
                 {/if}
                 {#if $featureSwitchIsTesting || $featureSwitchIsDebugging}
                   <span class="subtle">{config.id}</span>
diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestionDynamic.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestionDynamic.svelte
index aaa0c02fc8..38a70f94c9 100644
--- a/src/UI/Popup/TagRendering/TagRenderingQuestionDynamic.svelte
+++ b/src/UI/Popup/TagRendering/TagRenderingQuestionDynamic.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">/**
  * Wrapper around 'tagRenderingEditable' but might add mappings dynamically
+ *
+ * Note: does not forward the 'save-button'-slot
  */
 import TagRenderingConfig, { TagRenderingConfigUtils } from "../../../Models/ThemeConfig/TagRenderingConfig"
 import { UIEventSource } from "../../../Logic/UIEventSource"
@@ -9,6 +11,10 @@ import LayerConfig from "../../../Models/ThemeConfig/LayerConfig"
 import TagRenderingQuestion from "./TagRenderingQuestion.svelte"
 import type { UploadableTag } from "../../../Logic/Tags/TagUtils"
 import { writable } from "svelte/store"
+import Translations from "../../i18n/Translations"
+import { twJoin } from "tailwind-merge"
+import Tr from "../../Base/Tr.svelte"
+import { TrashIcon } from "@rgossiaux/svelte-heroicons/solid"
 
 export let config: TagRenderingConfig
 export let tags: UIEventSource<Record<string, string>>
@@ -23,7 +29,6 @@ export let allowDeleteOfFreeform: boolean = false
 
 
 let dynamicConfig = TagRenderingConfigUtils.withNameSuggestionIndex(config, tags, selectedElement)
-
 </script>
 
 <TagRenderingQuestion
@@ -35,4 +40,6 @@ let dynamicConfig = TagRenderingConfigUtils.withNameSuggestionIndex(config, tags
   {selectedTags}
   {allowDeleteOfFreeform}
   {extraTags}
-/>
+>
+  <slot name="cancel" slot="cancel" />
+</TagRenderingQuestion>