diff --git a/default/data/ui/views/cim_tstats_validator.xml b/default/data/ui/views/cim_tstats_validator.xml
index dfa662d..273046c 100644
--- a/default/data/ui/views/cim_tstats_validator.xml
+++ b/default/data/ui/views/cim_tstats_validator.xml
@@ -1,5 +1,5 @@
 <form version="1.1">
-  <label>Data Model TSTATS Review (Beta)</label>
+  <label>Data Model TSTATS Review</label>
   <!-- This isn't ready for prime-time, hence it hasn't been added to the navigation -->
   <description>Proof-of-concept base searches for an accelerated (tstats) CIM validation approach.  For now this is more of a data browser, but could be useful as-is for just browsing accelerated models.</description>
   <search id="magic">
@@ -23,7 +23,7 @@
 | where type != "objectCount" and !match(owner, "^Untagged_.*") and fieldName != "_time"
 | eval short_name = coalesce(displayName, fieldName)
 | eval dm_name = case(
-    owner="BaseEvent" or owner="root",  fieldName,
+    owner IN ("BaseEvent", "BaseSearch", "root"),  fieldName,
     true(),  owner . "." . fieldName)
 | eval stats_expr = urldecode("%0d") . "   values(". dm_name .") as ". short_name
 | table app, dm_model, title, dm_name, short_name, groupid, owner, objectName, parentName, stats_expr
@@ -34,7 +34,7 @@
 TODO:  Look at the 'lineage' field
 ```
 | eval nodename = case(
-    parentName IN ("BaseEvent", "root"),  objectName,
+    parentName IN ("BaseEvent", "BaseSearch", "root"),  objectName,
     true(),  "*" . parentName . "." . objectName)
 | eval da_search="| tstats summariesonly=t count as events, " . tstats_fields .  urldecode("%0d") . "from datamodel=" . title . " where nodename=" . nodename . " by index"
 | fields - stats_expr tstats_fields groupid