diff --git a/BeWo/View/Detail/AI/AiPromptbausteinSelectionView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinSelectionView.xaml
index bbff283d9..bc88617be 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinSelectionView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinSelectionView.xaml
@@ -34,8 +34,8 @@
             ItemContainerStyle="{DynamicResource igoal_treeitemstyle}"
             ItemTemplate="{StaticResource ai_promptbaustein_treeitemtemplate}"
             ItemsSource="{Binding ListVM.VMList, UpdateSourceTrigger=PropertyChanged}"
-            SelectedItemChanged="treeView_SelectedItemChanged"
-            PreviewMouseDown="treeView_PreviewMouseDown">
+            PreviewMouseDown="treeView_PreviewMouseDown"
+            SelectedItemChanged="treeView_SelectedItemChanged">
             <TreeView.Resources>
                 <Style x:Key="igoal_treeitemstyle" TargetType="TreeViewItem">
                     <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
diff --git a/Server/Components/AICore/Context/Entry/Navigation/CustomerNavigationContextEntry.cs b/Server/Components/AICore/Context/Entry/Navigation/CustomerNavigationContextEntry.cs
index 52def2aff..35f564ef5 100644
--- a/Server/Components/AICore/Context/Entry/Navigation/CustomerNavigationContextEntry.cs
+++ b/Server/Components/AICore/Context/Entry/Navigation/CustomerNavigationContextEntry.cs
@@ -28,7 +28,7 @@ namespace AICore.Context.Entry.Navigation
 		public string Bezugspersonen { get; set; }
 
 		[JsonPropertyName("CostBearerReferencesNumber")]
-		public Dictionary<long, string> CostBearerReferenceNumbers { get; set; }
+		public List<string> CostBearerReferenceNumbers { get; set; }
 
 		//[JsonPropertyName("Rechnungsadresse")]
 		//public string InvoiceAddressString { get; set; }
diff --git a/Server/Components/AICore/Context/EntryMapper/Navigation/CustomerNavigationContextEntryMapper.cs b/Server/Components/AICore/Context/EntryMapper/Navigation/CustomerNavigationContextEntryMapper.cs
index 93927bd3f..9c8341e31 100644
--- a/Server/Components/AICore/Context/EntryMapper/Navigation/CustomerNavigationContextEntryMapper.cs
+++ b/Server/Components/AICore/Context/EntryMapper/Navigation/CustomerNavigationContextEntryMapper.cs
@@ -17,7 +17,7 @@ namespace AICore.Context.EntryMapper.Navigation
 			pContext.FullName = pObject.GetLastNameFirstName();
 			pContext.Teams = pObject.Teams;
 			pContext.Bezugspersonen = pObject.MainAttendant;
-			pContext.CostBearerReferenceNumbers = pObject.CostBearerReferenceNumbers;
+			pContext.CostBearerReferenceNumbers = pObject.CostBearerReferenceNumbers.Values.ToList();
 		}
 	}
 }