diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/view.json
index 6cc2cbe8..b4f4432d 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/view.json
@@ -318,7 +318,7 @@
           "component": {
             "onActionPerformed": {
               "config": {
-                "script": "\tself.session.custom.searchId \u003d \"\"\n\tself.session.custom.deviceSearchId \u003d \"\"\n\tsystem.perspective.closePopup(id \u003d \"Search\")"
+                "script": "\tsystem.perspective.closePopup(id \u003d \"Search\")\n\tsystem.perspective.navigate(\n\t    view\u003dself.page.props.primaryView,\n\t    params\u003d{\"highlightTagPath\": \"CLEAR\"}\n\t)"
               },
               "scope": "G",
               "type": "script"
diff --git a/BNA8/ignition/script-python/autStand/Utils/code.py b/BNA8/ignition/script-python/autStand/Utils/code.py
index ab79332e..c46d0bd2 100644
--- a/BNA8/ignition/script-python/autStand/Utils/code.py
+++ b/BNA8/ignition/script-python/autStand/Utils/code.py
@@ -1,8 +1,14 @@
 def handleTagHighlight(view, currentValue):
 	tag_priority = currentValue.value
 
-	if tag_priority == None:
-		return
+	# --- CASE 1: Remove all highlights by applying CLEAR class ---
+	if not tag_priority or str(tag_priority).upper() == "CLEAR":
+	    for child in view.rootContainer.getChildren()[0].getChildren():
+	        try:
+	            child.props.style.classes = ""
+	        except:
+	            pass
+	    return False
 		
 	parts = str(tag_priority).split("||")
 	tag = parts[0]