diff --git a/.gitignore b/.gitignore
index d223948f..17463ff5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -401,3 +401,4 @@ FodyWeavers.xsd
 
 /fmtall
 /genmacall
+AssemblyInfo.cs
\ No newline at end of file
diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs
index cea460c8..4451490a 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs
@@ -2323,10 +2323,7 @@ namespace Volian.Controls.Library
 		{
 			foreach (Node tn in nodeCollection)
 			{
-				if (!tn.Checked)
-					tn.Checked = true;
-				else
-					tn.Checked = false;
+				tn.Checked = tn.Parent.Checked;
 
 				if (tn.Nodes != null && tn.Nodes.Count > 0 && tn.Nodes[0].Text != DummyNodeText) 
 					CheckTreeNodeChildren(tn.Nodes);
@@ -2559,10 +2556,15 @@ namespace Volian.Controls.Library
 
 				if (sd == null)
 				{
-					if (!lstCheckedStepTypesStr.Contains("WORD Sections"))
+					//C2023-010: Since the tag is null for Word Sections and HLS types, we need to determine which one has been selected.  Word sections we need
+					//to process, but we need to ignore adding HLS types.
+					if (n.Text == "WORD Sections")
 					{
-						lstCheckedStepTypes.Add(0); //use zero to identify attachment search
-						lstCheckedStepTypesStr.Add("WORD Sections");
+						if (!lstCheckedStepTypesStr.Contains("WORD Sections"))
+						{
+							lstCheckedStepTypes.Add(0); //use zero to identify attachment search
+							lstCheckedStepTypesStr.Add("WORD Sections");
+						}
 					}
 				}
 				else
@@ -2580,8 +2582,13 @@ namespace Volian.Controls.Library
 
 				if (sd == null)
 				{
-					lstCheckedStepTypesStr.Remove("WORD Sections");
-					lstCheckedStepTypes.Remove(0);
+					//C2023-010: Since the tag is null for Word Sections and HLS types, we need to determine which one has been selected.  Word sections we need
+					//to process, but we need to ignore removing HLS types since they were not added in the previous process.
+					if (n.Text == "WORD Sections")
+					{
+						lstCheckedStepTypesStr.Remove("WORD Sections");
+						lstCheckedStepTypes.Remove(0);
+					}
 				}
 				else
 				{
@@ -2590,6 +2597,17 @@ namespace Volian.Controls.Library
 				}
 			}
 
+			//C2023-010: Check if the node has children and if we need to process those children as well
+			if (n.HasChildNodes)
+			{
+				foreach (Node child in n.Nodes)
+				{
+					child.Checked = n.Checked;
+					advTreeStepTypes.SelectedNode = child;
+					advTreeStepTypes_AfterCheck(sender, null);
+				}
+			}
+
 			buildStepTypePannelTitle();
 
 			// B2021-100: Enable/disable the RNO Only checkbox & WORD Sections tree node in Step Elements to Search.