diff --git a/Editor/Scripts/Windows/BaseWindow.cs b/Editor/Scripts/Windows/BaseWindow.cs
index 64bba1e903b0e9623f8593e3d17e5ecc5dc74d87..fac183c629de2929bcd88f808cf424b47b1ed994 100644
--- a/Editor/Scripts/Windows/BaseWindow.cs
+++ b/Editor/Scripts/Windows/BaseWindow.cs
@@ -45,9 +45,9 @@ namespace ETSI.ARF.WorldStorage.UI
         // Keyvalues
         //
         [SerializeField] protected KeyvalueTagList keyValueTags = new KeyvalueTagList();
-        protected List<(string, string)> keyValuesFixed = new List<(string, string)>(3)
+        protected List<(string, string)> keyValuesFixed = new List<(string, string)>(4)
         {
-            ("", ""),("", ""),("", "")
+            ("", ""),("", ""),("", ""),("", "")
         };
         protected void OutputKeyValue(int n)
         {
diff --git a/Editor/Scripts/Windows/TrackableWindow.cs b/Editor/Scripts/Windows/TrackableWindow.cs
index c5d8f57f09ff86f85a90884d2d5773b7604eaecf..4135be09526f0b8dcf6e67d7b45eaca9f6c393d5 100644
--- a/Editor/Scripts/Windows/TrackableWindow.cs
+++ b/Editor/Scripts/Windows/TrackableWindow.cs
@@ -247,6 +247,7 @@ namespace ETSI.ARF.WorldStorage.UI
                 OutputKeyValue(0);
                 OutputKeyValue(1);
                 OutputKeyValue(2);
+                OutputKeyValue(3);
             }
             EditorGUILayout.EndToggleGroup();
             //
diff --git a/Runtime/Scripts/OpenAPI/UnityWebRequestHttpClient.cs b/Runtime/Scripts/OpenAPI/UnityWebRequestHttpClient.cs
index 43fd7f0d1fdcb5fa8ebd46b7ef7cec46463e618c..fb8a7af0c89afba02df5bce2a9edc0d94da8c2c1 100644
--- a/Runtime/Scripts/OpenAPI/UnityWebRequestHttpClient.cs
+++ b/Runtime/Scripts/OpenAPI/UnityWebRequestHttpClient.cs
@@ -108,9 +108,8 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
             {
                 try
                 {
-                    List<string> li = item.Value as List<string>;
-                    if (item.Key == "token") webRequest.SetRequestHeader(item.Key, li[0].ToString());  // add it
-                    if (item.Key == "sessionID") webRequest.SetRequestHeader(item.Key, li[0].ToString());  // add it
+                    List<string> li = item.Value.ToList<string>();
+                    webRequest.SetRequestHeader(item.Key, li[0]); // assume only one value
                 }
                 catch { }  // ignore it
             }