diff --git a/Logic/State/UserRelatedState.ts b/Logic/State/UserRelatedState.ts
index b214c70a4..703242c59 100644
--- a/Logic/State/UserRelatedState.ts
+++ b/Logic/State/UserRelatedState.ts
@@ -34,7 +34,8 @@ export default class UserRelatedState {
     public readonly mangroveIdentity: MangroveIdentity
     public readonly installedUserThemes: Store<string[]>
     public readonly showAllQuestionsAtOnce: UIEventSource<boolean>
-    public readonly showTags: UIEventSource<"no" | undefined | "always" | "yes">;
+    public static readonly SHOW_TAGS_VALUES = ["always","yes","full"] as const
+    public readonly showTags: UIEventSource<"no" | undefined | "always" | "yes" | "full">;
     public readonly homeLocation: FeatureSource
     public readonly language: UIEventSource<string>
     /**
diff --git a/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/UI/Popup/TagRendering/TagRenderingQuestion.svelte
index daadbb50f..fd5d44a11 100644
--- a/UI/Popup/TagRendering/TagRenderingQuestion.svelte
+++ b/UI/Popup/TagRendering/TagRenderingQuestion.svelte
@@ -20,6 +20,7 @@
     import {Translation} from "../../i18n/Translation";
     import Constants from "../../../Models/Constants";
     import {Unit} from "../../../Models/Unit";
+    import UserRelatedState from "../../../Logic/State/UserRelatedState";
 
     export let config: TagRenderingConfig;
     export let tags: UIEventSource<Record<string, string>>;
@@ -220,7 +221,7 @@
                     </button>
                 </slot>
             </div>
-            {#if $showTags === "yes" || $showTags === "always" || ($showTags === "" && numberOfCs >= Constants.userJourney.tagsVisibleAt) || $featureSwitchIsTesting || $featureSwitchIsDebugging}
+            {#if UserRelatedState.SHOW_TAGS_VALUES.indexOf($showTags) >= 0 || ($showTags === "" && numberOfCs >= Constants.userJourney.tagsVisibleAt) || $featureSwitchIsTesting || $featureSwitchIsDebugging}
                 <span class="flex justify-between flex-wrap">
                     <TagHint {state} tags={selectedTags} currentProperties={$tags}></TagHint>
                     <span class="flex flex-wrap">