diff --git a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
index 6b695c26c..838f8d2e2 100644
--- a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
+++ b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
@@ -59,10 +59,10 @@ function newSessionFunctions () {
     'Distance To Event->' +
     'Trigger On->Trigger Off->Take Position->Close Position->Next Phase->Move To Phase->' +
     'Strategy->' +
-    'Identifier->Begin->End->Strategy Name->Index->Stage Type->Status->Begin Rate->End Rate->Situation Name->' +
+    'Identifier->Begin->End->Strategy Name->Index->Trigger Stage Status->Open Stage Status->Manage Stage Status->Close Stage Status->Status->Begin Rate->End Rate->Situation Name->' +
     'Strategy Counters->Periods->' +
     'Position->' +
-    'Identifier->Begin->End->Rate->Size->Orders Size->Filled Size->Exit Type->Status->Begin Rate->End Rate->Situation Name->' +
+    'Identifier->Begin->End->Rate->Size->Open Stage Orders Size->Open Stage Filled Size->Close Stage Orders Size->Close Stage Filled Size->Exit Type->Status->Begin Rate->End Rate->Situation Name->' +
     'Stop Loss->Stop Loss Stage->Stop Loss Phase->' +
     'Take Profit->Take Profit Stage->Take Profit Phase->' +
     'Position Counters->Periods->' +
diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js
index 5ef146676..62fdbbdec 100644
--- a/FloatingSpace/UiObject.js
+++ b/FloatingSpace/UiObject.js
@@ -1406,6 +1406,7 @@ function newUiObject () {
   }
 
   function drawValue () {
+    if (currentValue === null) { return }
     if (hasValue === false) { return }
     if (canvas.floatingSpace.inMapMode === true) { return }
     if (thisObject.payload === undefined) { return }
@@ -1435,7 +1436,7 @@ function newUiObject () {
       const MAX_LABEL_LENGTH = 65
 
       label = currentValue
-      if (!isNaN(label)) {
+      if (!isNaN(currentValue)) {
         if (currentValue.toFixed !== undefined) {
           label = dynamicDecimals(currentValue)
         }