diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs
index d97898df..7b992efe 100644
--- a/PROMS/Volian.Controls.Library/DisplayRO.cs
+++ b/PROMS/Volian.Controls.Library/DisplayRO.cs
@@ -339,7 +339,7 @@ namespace Volian.Controls.Library
 						tmp = new TreeNode(chld[i].title.Replace(@"\u160?"," "));
 						tmp.Tag = chld[i];
 						if (chld[i].roid.Length == 16)
-							tn.Nodes.Add(tmp.Text);
+							tn.Nodes.Add(tmp);
 						else
 						{
 							int index = FindIndex(tn.Nodes, tmp.Text);
@@ -489,11 +489,14 @@ namespace Volian.Controls.Library
 					tnExpand.Expand();
 					foreach (TreeNode tn in tnExpand.Nodes)
 					{
-						ROFSTLookup.rochild chld = (ROFSTLookup.rochild)tn.Tag;
-						if (chld.roid == roid)
+						if (tn.Tag != null)
 						{
-							tnExpand = tn;
-							break;
+							ROFSTLookup.rochild chld = (ROFSTLookup.rochild)tn.Tag;
+							if (chld.roid.ToUpper() == roid.ToUpper())
+							{
+								tnExpand = tn;
+								break;
+							}
 						}
 					}
 				}