diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml
index 8d86bbd3..eca9b25d 100644
Binary files a/PROMS/Formats/fmtall/BNPP1all.xml and b/PROMS/Formats/fmtall/BNPP1all.xml differ
diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml
index 9af0ecec..7c4477e1 100644
Binary files a/PROMS/Formats/fmtall/BNPPalrall.xml and b/PROMS/Formats/fmtall/BNPPalrall.xml differ
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index 8cf6048f..f50d846f 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -2123,8 +2123,8 @@ namespace VEPROMS.CSLA.Library
 							string wordMatchEnd = Regex.IsMatch(replaceWord.Substring(replaceWord.Length - 1, 1), @"\W") ? "" : @"(?=\W|$)";
 							string pat = wordMatchBeg + @"(?<!\\u160\?|\\u8209\?|\\b|\-)" + replaceWord + @"(?!\\u160\?|\\u8209\?|\-)" + wordMatchEnd;
 							// C2021-061:  For Barakah don't do replace if word is surrounded by " or ', i.e. they are no longer delimiters
-							if (_MyItemInfo != null && _MyItemInfo.ActiveFormat != null && _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.NoReplaceQuoteWords)
-								pat = wordMatchBeg + @"(?<!\\u160\?|\\u8209\?|\\b|\-|""|')" + replaceWord + @"(?!\\u160\?|\\u8209\?|\-|""|')" + wordMatchEnd;
+							if (_MyItemInfo != null && _MyItemInfo.ActiveFormat != null && _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.NoReplaceQuoteParenWords)
+								pat = wordMatchBeg + @"(?<!\\u160\?|\\u8209\?|\\b|\-|""|'|\()" + replaceWord + @"(?!\\u160\?|\\u8209\?|\-|""|'|\))" + wordMatchEnd;
 							dicReplaceRegex.Add(rs, new Regex(pat, myOptions));
 							//ProfileTimer.Pop(profileDepth3);
 						}
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 13a49071..1721c0b5 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -1683,6 +1683,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _height, "@height");
 			}
 		}
+		private LazyLoad<string> _hasAppl;
+		public string hasAppl
+		{
+			get
+			{
+				return LazyLoad(ref _hasAppl, "@hasAppl");
+			}
+		}
 	}
 	#endregion
 	#region SIAll
@@ -2443,12 +2451,13 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		// C2021-061:  For Barakah don't do replace if word is surrounded by " or '
-		private LazyLoad<bool> _NoReplaceQuoteWords;
-		public bool NoReplaceQuoteWords
+		//	Initial fix was 11/3/21.  Added parens do the quotes on 11/16/21
+		private LazyLoad<bool> _NoReplaceQuoteParenWords;
+		public bool NoReplaceQuoteParenWords
 		{
 			get
 			{
-				return LazyLoad(ref _NoReplaceQuoteWords, "@NoReplaceQuoteWords");
+				return LazyLoad(ref _NoReplaceQuoteParenWords, "@NoReplaceQuoteParenWords");
 			}
 		}
 		private LazyLoad<bool> _UseMetaSections;