diff --git a/deps/flecs.c b/deps/flecs.c
index f7331b3..3b88cbf 100644
--- a/deps/flecs.c
+++ b/deps/flecs.c
@@ -1285,7 +1285,7 @@ typedef enum {
     EcsQueryAnd,            /* And operator: find or match id against variable source */
     EcsQueryAndId,          /* And operator for fixed id (no wildcards/variables) */
     EcsQueryAndAny,         /* And operator with support for matching Any src/id */
-    EcsQuerySelectAny,      /* Dedicated instruction for _ queries where the src is unknown */
+    EcsQueryOnlyAny,      /* Dedicated instruction for _ queries where the src is unknown */
     EcsQueryTriv,           /* Trivial search (batches multiple terms) */
     EcsQueryTrivData,       /* Trivial search with setting data fields */
     EcsQueryTrivWildcard,   /* Trivial search with (exclusive) wildcard ids */
@@ -32260,7 +32260,7 @@ const char* flecs_query_op_str(
     case EcsQueryCacheData:      return "cachepop  ";
     case EcsQueryIsCache:        return "xcache    ";
     case EcsQueryIsCacheData:    return "xcachepop ";
-    case EcsQuerySelectAny:      return "any       ";
+    case EcsQueryOnlyAny:      return "any       ";
     case EcsQueryUp:             return "up        ";
     case EcsQueryUpId:           return "upid      ";
     case EcsQuerySelfUp:         return "selfup    ";
@@ -64947,7 +64947,7 @@ int flecs_query_compile_term(
     } else if (!src_written && term->id == EcsAny && op.kind == EcsQueryAndAny) {
         /* Lookup variables ($var.child_name) are always written */
         if (!src_is_lookup) {
-            op.kind = EcsQuerySelectAny; /* Uses Any (_) id record */
+            op.kind = EcsQueryOnlyAny; /* Uses Any (_) id record */
         }
     }
 
@@ -69609,7 +69609,7 @@ bool flecs_query_dispatch(
     case EcsQueryIsCache: return flecs_query_is_cache(op, redo, ctx);
     case EcsQueryCacheData: return flecs_query_cache_data(op, redo, ctx);
     case EcsQueryIsCacheData: return flecs_query_is_cache_data(op, redo, ctx);
-    case EcsQuerySelectAny: return flecs_query_select_any(op, redo, ctx);
+    case EcsQueryOnlyAny: return flecs_query_select_any(op, redo, ctx);
     case EcsQueryUp: return flecs_query_up(op, redo, ctx);
     case EcsQueryUpId: return flecs_query_up_id(op, redo, ctx);
     case EcsQuerySelfUp: return flecs_query_self_up(op, redo, ctx);
diff --git a/etc/v4/js/components/pages/entities/pane-tree.vue b/etc/v4/js/components/pages/entities/pane-tree.vue
index 5ec57d6..6d67035 100644
--- a/etc/v4/js/components/pages/entities/pane-tree.vue
+++ b/etc/v4/js/components/pages/entities/pane-tree.vue
@@ -27,7 +27,7 @@ export default { name: "pane-tree" }
 </script>
 
 <script setup>
-import { computed, defineProps, defineModel, emits, ref } from 'vue';
+import { computed, defineProps, defineModel, ref } from 'vue';
 
 const props = defineProps({
   conn: {type: Object, required: true},
diff --git a/etc/v4/js/components/widgets/inspector/entity-inspector.vue b/etc/v4/js/components/widgets/inspector/entity-inspector.vue
index 0c4db18..104f3ed 100644
--- a/etc/v4/js/components/widgets/inspector/entity-inspector.vue
+++ b/etc/v4/js/components/widgets/inspector/entity-inspector.vue
@@ -16,13 +16,17 @@
       </div>
       <entity-path :path="entityQueryResult.parent"></entity-path>
       <template v-if="entityLabel">
-        <span class="entity-inspector-name">{{ entityLabel }}</span>
+        <span class="entity-inspector-name">{{ entityLabel }}
+          <span class="entity-inspector-id">{{ entityId }}</span>
+        </span>
         <template v-if="expand">
           <span class="entity-inspector-actual-name">{{ entityQueryResult.name }}</span>
         </template>
       </template>
       <template v-else>
-        <span class="entity-inspector-name">{{ entityQueryResult.name }}</span>
+        <span class="entity-inspector-name">{{ entityQueryResult.name }}
+          <span class="entity-inspector-id">{{ entityId }}</span>
+        </span>
       </template>
 
       <template v-if="expand">
@@ -99,6 +103,7 @@ const entityQuery = ref();
 const entityQueryResult = ref();
 const entityModules = ref([]);
 const entityLabel = ref();
+const entityId = ref();
 const expand = ref(false);
 const isDisabled = ref(false);
 const isScript = ref(false);
@@ -183,6 +188,7 @@ function updateQuery() {
           try: true, 
           managed: true,
           values: inspectorMode.value == "Components",
+          entity_id: true,
           full_paths: true, 
           type_info: true,
           private: true,
@@ -216,6 +222,8 @@ function updateQuery() {
 
           loadTypeFromReply(moduleMap, reply);
 
+          entityId.value = '#' + reply.id;
+
           // Extract entity label
           entityLabel.value = undefined;
           if (reply.components) {
@@ -311,6 +319,11 @@ div.entity-inspector {
   padding: 8px;
 }
 
+span.entity-inspector-id {
+  font-size: 0.9rem;
+  color: var(--secondary-text);
+}
+
 span.entity-inspector-name {
   font-size: 1.1em;
   font-weight: 300;
diff --git a/etc/v4/js/components/widgets/tree/entity-subtree.vue b/etc/v4/js/components/widgets/tree/entity-subtree.vue
index 1362a6a..7437a32 100644
--- a/etc/v4/js/components/widgets/tree/entity-subtree.vue
+++ b/etc/v4/js/components/widgets/tree/entity-subtree.vue
@@ -86,7 +86,11 @@ function updateQuery() {
   }
 
   if (nf) {
-    q += `, $this ~= "${nf}"`;
+    if (nf[0] == '#') {
+      q += `, $this == "${nf}"`;
+    } else {
+      q += `, $this ~= "${nf}"`;
+    }
   }
 
   treeQuery.value =