diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs
index bd9adf04..9fc5cb6c 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs
@@ -2712,6 +2712,17 @@ namespace Volian.Controls.Library
 					lstCheckedStepTypes.Remove((int)sd.Index);
 					lstCheckedStepTypesStr.Remove(advTreeStepTypes.SelectedNode.Text);
 				}
+
+				//B2025-012 Find Step Elements
+				//uncheck the parents if there are any
+				DevComponents.AdvTree.Node tmp_n = n;
+				while (tmp_n.Parent != null)
+				{
+					tmp_n = tmp_n.Parent;
+					tmp_n.Checked = false;
+				}
+				//uncheck All Types
+				advTreeStepTypes.Nodes[0].Checked = false;
 			}
 
 			//C2023-010: Check if the node has children and if we need to process those children as well
@@ -2724,6 +2735,37 @@ namespace Volian.Controls.Library
 					advTreeStepTypes_AfterCheck(sender, null);
 				}
 			}
+			else if (n.Text == "All Types")
+			{
+				//B2025-012 Find Step Elements
+				//if checking / un-checking All Types
+				//Add Types to type list appropriately
+				if (n.Checked)
+				{
+					foreach (Node child in advTreeStepTypes.Nodes)
+					{
+						if (child.Text != "All Types")
+                        {
+							child.Checked = true;
+							advTreeStepTypes.SelectedNode = child;
+							advTreeStepTypes_AfterCheck(sender, null);
+						}
+					}
+				}
+				else
+                {
+					foreach (Node child in advTreeStepTypes.Nodes)
+					{
+						if (child.Text != "All Types")
+						{
+							child.Checked = false;
+							advTreeStepTypes.SelectedNode = child;
+							advTreeStepTypes_AfterCheck(sender, null);
+						}
+					}
+				}
+
+			}
 
 			buildStepTypePannelTitle();