diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index c8373f37..54bab234 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -196,7 +196,7 @@ namespace Volian.Controls.Library
 					switch (chld.type)
 					{
 						case 1: // standard (regular) text RO type
-							tbROValue.Text = chld.value;
+							tbROValue.Text = chld.value.Replace(@"\u160?"," ");
 							btnPreviewRO.Enabled = false;
 							break;
 						case 2: // Table RO type
@@ -318,7 +318,7 @@ namespace Volian.Controls.Library
 					//}
 					else
 					{
-						tmp = new TreeNode(chld[i].title);
+						tmp = new TreeNode(chld[i].title.Replace(@"\u160?"," "));
 						tmp.Tag = chld[i];
 						int index = FindIndex(tn.Nodes, tmp.Text);
 						tn.Nodes.Insert(index,tmp);
@@ -423,7 +423,7 @@ namespace Volian.Controls.Library
 				if (rochld.ID == -1) myid = -1;
 			}
 			TreeNode tnExpand = null;
-			int titm = System.Convert.ToInt32(db);
+			int titm = System.Convert.ToInt32(db, 16);  //(db);
 			// find database first
 			foreach (TreeNode tn in tvROFST.Nodes)
 			{
@@ -439,24 +439,19 @@ namespace Volian.Controls.Library
 			// use the path id list to load/find the treeview's nodes.
 			foreach (int citm in path)
 			{
-				if (citm != System.Convert.ToInt32(db))
+				LoadChildren(tnExpand);
+				tnExpand.Expand();
+				foreach (TreeNode tn in tnExpand.Nodes)
 				{
-					LoadChildren(tnExpand);
-					tnExpand.Expand();
-					foreach (TreeNode tn in tnExpand.Nodes)
+					ROFSTLookup.rochild chld = (ROFSTLookup.rochild)tn.Tag;
+					if (chld.ID == citm)
 					{
-						ROFSTLookup.rochild chld = (ROFSTLookup.rochild)tn.Tag;
-						if (chld.ID == citm)
-						{
-							tnExpand = tn;
-							break;
-						}
+						tnExpand = tn;
+						break;
 					}
 				}
 			}
 
-			//if (tnExpand != null) tvROFST.SelectedNode = tnExpand;
-
 			if (tnExpand != null)
 			{
 				// If a multiple return value, try to select the proper node
@@ -491,8 +486,24 @@ namespace Volian.Controls.Library
 				DisplayTabItem dti = _TabControl.SelectedDisplayTabItem; //.OpenItem(_ItemInfo); // open the corresponding procedure text
 				if (dti.MyDSOTabPanel != null) // A Word Document tab is the active tab
 				{
+					int dbiId = System.Convert.ToInt32(roch.roid.Substring(0, 4), 16);
 					ROFSTLookup.rodbi[] dbs = MyROFST.ROFSTLookup.GetRODatabaseList();
-					ROFSTLookup.rodbi db = dbs[int.Parse(roch.roid.Substring(0, 4))-1];
+					bool dbFound = false;
+					ROFSTLookup.rodbi db = dbs[0];
+					foreach (ROFSTLookup.rodbi rodbi in dbs)
+					{
+						if (dbiId == rodbi.dbiID)
+						{
+							db = rodbi;
+							dbFound = true;
+							break;
+						}
+					}
+					if (!dbFound)
+					{
+						MessageBox.Show("Error occurred finding RO. Contact Volian");
+						return;
+					}
 					string accPrefix = db.dbiAP.Replace(_Mydvi.DocVersionConfig.RODefaults_graphicsprefix,"IG");
 					accPrefix = accPrefix.Replace(_Mydvi.DocVersionConfig.RODefaults_setpointprefix, "SP");
 //					string accPrefix = (roch.type == 8) ? _Mydvi.DocVersionConfig.RODefaults_graphicsprefix : _Mydvi.DocVersionConfig.RODefaults_setpointprefix;