diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 123c9eba..816e6fa2 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -1607,8 +1607,11 @@ namespace VEPROMS.CSLA.Library
 			get 
 			{
 				string str = MyContent.Text;
-				if (str.Contains("<u>"))
-					str = str.Replace("<u>", MyDocVersion.DocVersionConfig.Unit_Number);
+				str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
+				//if (str.Contains("<u>"))
+				//  str = str.Replace("<u>", MyDocVersion.DocVersionConfig.Unit_Number);
+				//if (str.Contains("<U>"))
+				//  str = str.Replace("<U>", MyDocVersion.DocVersionConfig.Unit_Number);
 				return ConvertToDisplayText(str); 
 			}
 		}
@@ -1617,8 +1620,9 @@ namespace VEPROMS.CSLA.Library
 			get 
 			{
 				string str = (this.IsProcedure) ? MyDocVersion.UnitSpecific(MyContent.Number, 0) : MyContent.Number;
-				if (str.Contains("<U-ID>"))
-					str = str.Replace("<U-ID>", MyDocVersion.DocVersionConfig.Unit_ID);
+				str = Regex.Replace(str, @"\<([uU]-[iI][dD])\>", MyDocVersion.DocVersionConfig.Unit_ID);
+				//if (str.Contains("<U-ID>"))
+				//  str = str.Replace("<U-ID>", MyDocVersion.DocVersionConfig.Unit_ID);
 				//if (str.Contains(@"<S\u8209?ID>"))
 				//  str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID);
 				str = ConvertToDisplayText(str);