diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
index 5f319973..8c100995 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
@@ -178,6 +178,18 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		#endregion
+		#region AlignHLSTabWithSect
+		[Category("Miscellaneous")]
+		[Description("Align HLS Tab With Sect")]
+		private LazyLoad<bool> _AlignHLSTabWithSect;
+		public bool AlignHLSTabWithSect
+		{
+			get
+			{
+				return LazyLoad(ref _AlignHLSTabWithSect, "@AlignHLSTabWithSect");
+			}
+		}
+		#endregion
 		#region pagestyle
 		private PageStyle _pagestyle;
 		[Category("Miscellaneous")]
diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs
index ae1eebbc..9fa0b476 100644
--- a/PROMS/Volian.Controls.Library/DisplayText.cs
+++ b/PROMS/Volian.Controls.Library/DisplayText.cs
@@ -1482,8 +1482,12 @@ namespace Volian.Controls.Library
 						//RegexOptions myOptions = (rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase & RegexOptions.Singleline : RegexOptions.None & RegexOptions.Singleline;
 						RegexOptions myOptions = (rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase: RegexOptions.None;
 						string replaceWord = Regex.Replace(rs.ReplaceWord, @"[[\]\\()]", @"\$0");
-						string pat = @"(?<=\W|^)(?<!\\u160\?)" + replaceWord + @"(?!\\u160\?)(?=\W|$)";
-							dicReplaceRegex.Add(rs, new Regex(pat, myOptions));
+						// if first or last character in replaceword is a non-word character, for example, ',', ')', or '.',
+						// 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\?)" + replaceWord + @"(?!\\u160\?)" + wordMatchEnd;
+						dicReplaceRegex.Add(rs, new Regex(pat, myOptions));
 					}
 					try
 					{