diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
index ebeadcb3..f3b1313a 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
@@ -293,10 +293,11 @@ namespace VEPROMS.CSLA.Library
 				else if (val.ToUpper() == "<U-NUMBER>") val = MyDocVersionInfo.DocVersionConfig.Unit_Number;
 				else if (val.ToUpper() == "<U-NAME>") val = MyDocVersionInfo.DocVersionConfig.Unit_Name;
 				else if (val.ToUpper() == "<U-ID>") val = MyDocVersionInfo.DocVersionConfig.Unit_ID;
-				else if (val.ToUpper() == "<U-OTHER TEXT>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Text;
-				else if (val.ToUpper() == "<U-OTHER NUMBER>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Number;
-				else if (val.ToUpper() == "<U-OTHER NAME>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Name;
-				else if (val.ToUpper() == "<U-OTHER ID>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_ID;
+				// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
+				else if (val.ToUpper() == "<U-OTHERTEXT>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Text;
+				else if (val.ToUpper() == "<U-OTHERNUMBER>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Number;
+				else if (val.ToUpper() == "<U-OTHERNAME>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Name;
+				else if (val.ToUpper() == "<U-OTHERID>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_ID;
 			}
 			return val;
 		}
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs
index 0d391bbd..f9d23702 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs
@@ -393,7 +393,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			ProcedureInfo pi = ii as ProcedureInfo;
 			if (pi == null) return "";
-			string unitdes = "ID"; 
+			string unitdes = "ID";
 			string prefix = null;
 			string fromunitdes = null;
 			str = ItemInfo.ConvertToDisplayText(pi.MyContent.Number);
@@ -425,6 +425,15 @@ namespace VEPROMS.CSLA.Library
 				fromunitdes = DocVersionConfig.Unit_Name;
 			else if (unitdes == "TEXT")
 				fromunitdes = DocVersionConfig.Unit_Text;
+			// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
+			else if (unitdes == "OTHERTEXT")
+				fromunitdes = DocVersionConfig.Other_Unit_Text;
+			else if (unitdes == "OTHERNUMBER")
+				fromunitdes = DocVersionConfig.Other_Unit_Number;
+			else if (unitdes == "OTHERNAME")
+				fromunitdes = DocVersionConfig.Other_Unit_Name;
+			else if (unitdes == "OTHERID")
+				fromunitdes = DocVersionConfig.Other_Unit_ID;
 			else
 				fromunitdes = DocVersionConfig.Unit_ID;
 			
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
index 37314b67..2b409279 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
@@ -1004,10 +1004,11 @@ namespace VEPROMS.CSLA.Library
 						else if (sel.Text.ToUpper() == "<U-NUMBER>") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_Number;
 						else if (sel.Text.ToUpper() == "<U-NAME>") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_Name;
 						else if (sel.Text.ToUpper() == "<U-ID>") val = lookup.MyDocVersionInfo.DocVersionConfig.Unit_ID;
-						else if (sel.Text.ToUpper() == "<U-OTHER TEXT>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Text;
-						else if (sel.Text.ToUpper() == "<U-OTHER NUMBER>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Number;
-						else if (sel.Text.ToUpper() == "<U-OTHER NAME>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Name;
-						else if (sel.Text.ToUpper() == "<U-OTHER ID>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_ID;
+						// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
+						else if (sel.Text.ToUpper() == "<U-OTHERTEXT>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Text;
+						else if (sel.Text.ToUpper() == "<U-OTHERNUMBER>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Number;
+						else if (sel.Text.ToUpper() == "<U-OTHERNAME>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_Name;
+						else if (sel.Text.ToUpper() == "<U-OTHERID>") val = lookup.MyDocVersionInfo.DocVersionConfig.Other_Unit_ID;
 						//val = "<U-ID>",MyDocVersion.DocVersionConfig.Unit_ID);
 						//text = text.Replace(@"<S\u8209?ID>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_ProcedureSetID);
 						//text = text.Replace("<U>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Number);
diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
index c609f151..d049471f 100644
--- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
+++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
@@ -2319,10 +2319,11 @@ i = 0;
 				else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
 				else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
 				else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
-				else if (tmp == "<U-OTHER TEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
-				else if (tmp == "<U-OTHER NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
-				else if (tmp == "<U-OTHER NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
-				else if (tmp == "<U-OTHER ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
+				// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
+				else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
+				else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
+				else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
+				else if (tmp == "<U-OTHERID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
 			}
 			return str;
 		}