diff --git a/hanatui/publish/hanatui b/hanatui/publish/hanatui
index c24a562..6402077 100755
Binary files a/hanatui/publish/hanatui and b/hanatui/publish/hanatui differ
diff --git a/hanatui/src/Tui/KeySelectionScreen.cs b/hanatui/src/Tui/KeySelectionScreen.cs
index a8fce70..19a767f 100644
--- a/hanatui/src/Tui/KeySelectionScreen.cs
+++ b/hanatui/src/Tui/KeySelectionScreen.cs
@@ -74,7 +74,9 @@ public static class KeySelectionScreen
             .Title("[bold]Select HDBUSERSTORE key:[/]")
             .PageSize(15)
             .HighlightStyle(Style.Parse("bold dodgerblue1"))
-            .UseConverter(name => displayMap.TryGetValue(name, out var label) ? label : name)
+            .UseConverter(name => displayMap.TryGetValue(name, out var label)
+                ? Markup.Escape(label)
+                : Markup.Escape(name))
             .AddChoices(choiceNames);
 
         var selected = AnsiConsole.Prompt(prompt);
diff --git a/hanatui/src/Tui/OperationForms.cs b/hanatui/src/Tui/OperationForms.cs
index b13e8e4..b43e4b1 100644
--- a/hanatui/src/Tui/OperationForms.cs
+++ b/hanatui/src/Tui/OperationForms.cs
@@ -52,7 +52,7 @@ public static class OperationForms
             {
                 manualSentinel => "[ Enter manually ]",
                 cancelSentinel => "[ Cancel ]",
-                _ => v,
+                _ => Markup.Escape(v),
             })
             .AddChoices(choiceValues);
 
@@ -89,7 +89,7 @@ public static class OperationForms
     private static void PrintOperationHeader(string title)
     {
         AnsiConsole.Clear();
-        var rule = new Rule($"[bold dodgerblue1]{title}[/]").RuleStyle(Style.Parse("dodgerblue1"));
+        var rule = new Rule($"[bold dodgerblue1]{Markup.Escape(title)}[/]").RuleStyle(Style.Parse("dodgerblue1"));
         AnsiConsole.Write(rule);
         AnsiConsole.WriteLine();
     }
@@ -101,8 +101,8 @@ public static class OperationForms
         table.AddColumn("[bold]Parameter[/]");
         table.AddColumn("[bold]Value[/]");
         foreach (var (k, v) in fields)
-            table.AddRow($"[dim]{k}[/]", $"[yellow]{Markup.Escape(v)}[/]");
-        AnsiConsole.MarkupLine($"[bold]{title}[/]");
+            table.AddRow($"[dim]{Markup.Escape(k)}[/]", $"[yellow]{Markup.Escape(v)}[/]");
+        AnsiConsole.MarkupLine($"[bold]{Markup.Escape(title)}[/]");
         AnsiConsole.Write(table);
         AnsiConsole.WriteLine();