diff --git a/PROMS/Formats/fmtall/AEPall.xml b/PROMS/Formats/fmtall/AEPall.xml
index 36e6e4b6..aaf66094 100644
Binary files a/PROMS/Formats/fmtall/AEPall.xml and b/PROMS/Formats/fmtall/AEPall.xml differ
diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs
index 880d3096..3e2f5b7b 100644
--- a/PROMS/Volian.Controls.Library/DisplayText.cs
+++ b/PROMS/Volian.Controls.Library/DisplayText.cs
@@ -1817,7 +1817,7 @@ namespace Volian.Controls.Library
 							// don't use the \W, i.e. don't bother to look for a non-word character.
 							string wordMatchBeg = Regex.IsMatch(replaceWord.Substring(0, 1), @"\W") ? "" : @"(?<=\W|^)";
 							string wordMatchEnd = Regex.IsMatch(replaceWord.Substring(replaceWord.Length - 1, 1), @"\W") ? "" : @"(?=\W|$)";
-							string pat = wordMatchBeg + @"(?<!\\u160\?|\\u8209\?)" + replaceWord + @"(?!\\u160\?|\\u8209\?)" + wordMatchEnd;
+							string pat = wordMatchBeg + @"(?<!\\u160\?|\\u8209\?|\\b)" + replaceWord + @"(?!\\u160\?|\\u8209\?)" + wordMatchEnd;
 							dicReplaceRegex.Add(rs, new Regex(pat, myOptions));
 							//ProfileTimer.Pop(profileDepth3);
 						}
@@ -2101,7 +2101,7 @@ namespace Volian.Controls.Library
 							}
 							string preceedingText = text.Substring(0, offset + foundMatch.MyMatch.Index);
 							int ndxBold = preceedingText.LastIndexOf(@"\b");
-							if (ndxBold > -1 && preceedingText[ndxBold + 2] != '0' && with.Contains(@"\b "))
+							if (ndxBold > -1 && preceedingText.Length>(ndxBold+2) && preceedingText[ndxBold + 2] != '0' && with.Contains(@"\b "))
 							{
 								with = with.Replace(@"\b ","");
 								with = with.Replace(@"\b0 ","");