diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index 40d9cfd0..1eddd662 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -218,6 +218,8 @@ namespace Volian.Controls.Library
 						case 1: // standard (regular) text RO type
 							tbROValue.Text = chld.value.Replace(@"\u160?"," ");
 							btnPreviewRO.Enabled = false;
+							if (chld.roid.StartsWith("FFFF"))
+								btnGoToRO.Enabled = false;
 							break;
 						case 2: // Table RO type
 						case 3: // This is type 3 when part of a multiple return value
@@ -416,6 +418,36 @@ namespace Volian.Controls.Library
 				tvROFST.Nodes.Add(tn);
 				AddDummyGroup(_MyROFST.ROFSTLookup.myHdr.myDbs[i], tn);
 			}
+			if (this.Mydvi.MultiUnitCount > 1)
+			{
+				TreeNode tnn = tvROFST.Nodes.Add("Unit Information");
+					/*
+			if (ROID == "FFFF00000001") return _ROFstInfo.docVer.DocVersionConfig.Unit_Number;
+			if (ROID == "FFFF00000002") return _ROFstInfo.docVer.DocVersionConfig.Other_Unit_Number;
+			if (ROID == "FFFF00000003") return _ROFstInfo.docVer.DocVersionConfig.Unit_Text;
+			if (ROID == "FFFF00000004") return _ROFstInfo.docVer.DocVersionConfig.Other_Unit_Text;
+			if (ROID == "FFFF00000005") return _ROFstInfo.docVer.DocVersionConfig.Unit_ID;
+			if (ROID == "FFFF00000006") return _ROFstInfo.docVer.DocVersionConfig.Other_Unit_ID;
+			if (ROID == "FFFF00000007") return _ROFstInfo.docVer.DocVersionConfig.Unit_Name;
+			if (ROID == "FFFF00000008") return _ROFstInfo.docVer.DocVersionConfig.Other_Unit_Name;
+					*/
+				TreeNode cn = tnn.Nodes.Add("Number");
+				cn.Tag = MyROFST.ROFSTLookup.GetRoChild("FFFF00000001");
+				cn = tnn.Nodes.Add("Other Number");
+				cn.Tag = MyROFST.ROFSTLookup.GetRoChild("FFFF00000002");
+				cn = tnn.Nodes.Add("Text");
+				cn.Tag = MyROFST.ROFSTLookup.GetRoChild("FFFF00000003");
+				cn = tnn.Nodes.Add("Other Text");
+				cn.Tag = MyROFST.ROFSTLookup.GetRoChild("FFFF00000004");
+				cn = tnn.Nodes.Add("ID");
+				cn.Tag = MyROFST.ROFSTLookup.GetRoChild("FFFF00000005");
+				cn = tnn.Nodes.Add("Other ID");
+				cn.Tag = MyROFST.ROFSTLookup.GetRoChild("FFFF00000006");
+				cn = tnn.Nodes.Add("Name");
+				cn.Tag = MyROFST.ROFSTLookup.GetRoChild("FFFF00000007");
+				cn = tnn.Nodes.Add("Other Name");
+				cn.Tag = MyROFST.ROFSTLookup.GetRoChild("FFFF00000008");
+			}
 		}
 		private void AddDummyGroup(ROFSTLookup.rodbi rodbi, TreeNode tn)
 		{
@@ -460,12 +492,15 @@ namespace Volian.Controls.Library
 			// find database first
 			foreach (TreeNode tn in tvROFST.Nodes)
 			{
-				ROFSTLookup.rodbi thisdb = (ROFSTLookup.rodbi)tn.Tag;
-				if (thisdb.dbiID == titm)
+				if (tn.Tag != null)
 				{
-					LoadChildren(tn);
-					tnExpand = tn;
-					break;
+					ROFSTLookup.rodbi thisdb = (ROFSTLookup.rodbi)tn.Tag;
+					if (thisdb.dbiID == titm)
+					{
+						LoadChildren(tn);
+						tnExpand = tn;
+						break;
+					}
 				}
 			}
 			if (tnExpand == null) return;  // something went wrong?