diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index 9f8d4d0b..7d6f4c37 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -3021,7 +3021,7 @@ rd_view_ui(Rng2F32 rect)
                         }
                         else
                         {
-                          did_cmd = 0;
+                          rd_cmd(RD_CmdKind_PushQuery, .expr = e_string_from_expr(scratch.arena, eval.expr, str8_zero()));
                         }
                       }break;
                       case E_SpaceKind_File:
@@ -3043,7 +3043,7 @@ rd_view_ui(Rng2F32 rect)
                         }
                         else
                         {
-                          did_cmd = 0;
+                          rd_cmd(RD_CmdKind_PushQuery, .expr = e_string_from_expr(scratch.arena, eval.expr, str8_zero()));
                         }
                       }break;
                       case RD_EvalSpaceKind_MetaUnattachedProcess:
@@ -12205,7 +12205,6 @@ rd_frame(void)
         e_string2typekey_map_insert(rd_frame_arena(), rd_state->meta_name2type_map, str8_lit("environment"),
                                     e_type_key_cons(.kind = E_TypeKind_Set,
                                                     .name = str8_lit("environment"),
-                                                    .flags = E_TypeFlag_EditableChildren,
                                                     .irext  = E_TYPE_IREXT_FUNCTION_NAME(environment),
                                                     .access = E_TYPE_ACCESS_FUNCTION_NAME(environment),
                                                     .expand =
@@ -12674,14 +12673,19 @@ rd_frame(void)
                                       "query:commands, "
                                       "query:$%I64x, "
                                       "query:$%I64x, "
+                                      "query:targets, "
                                       "query:recent_files, "
                                       "query:recent_projects, "
-                                      "query:procedures, "
                                       "query:processes, "
                                       "query:threads, "
                                       "query:modules, "
                                       "query:user_settings, "
-                                      "query:project_settings, ",
+                                      "query:project_settings, "
+                                      "query:procedures, "
+                                      "query:types, "
+                                      "query:globals, "
+                                      "query:thread_locals, "
+                                      ,
                                       rd_regs()->view, rd_regs()->window);
             rd_cmd(RD_CmdKind_PushQuery, .expr = expr, .do_implicit_root = 1, .do_lister = 1, .do_big_rows = 1);
           }break;
diff --git a/src/raddbg/raddbg_eval.c b/src/raddbg/raddbg_eval.c
index 4fb4523f..79067747 100644
--- a/src/raddbg/raddbg_eval.c
+++ b/src/raddbg/raddbg_eval.c
@@ -620,7 +620,7 @@ E_TYPE_IREXT_FUNCTION_DEF(cfgs)
     
     //- rjf: gather commands
     String8List cmds_list = {0};
-    if(rd_view_query_cmd().size == 0)
+    if(rd_cfg_child_from_string(rd_cfg_from_id(rd_regs()->view), str8_lit("lister")) == &rd_nil_cfg)
     {
       MD_NodePtrList schemas = rd_schemas_from_name(cfg_name);
       for(MD_NodePtrNode *n = schemas.first; n != 0; n = n->next)
diff --git a/src/raddbg/raddbg_views.c b/src/raddbg/raddbg_views.c
index a912abaa..18ae3d0d 100644
--- a/src/raddbg/raddbg_views.c
+++ b/src/raddbg/raddbg_views.c
@@ -1449,7 +1449,8 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
   //- rjf: unpack evaluation
   //
   E_Type *cell_type = e_type_from_key__cached(cell->eval.irtree.type_key);
-  if(cell->eval.space.u64s[1] == 0)
+  MD_NodePtrList cell_schemas = rd_schemas_from_name(cell_type->name);
+  if(cell->eval.space.u64s[1] == 0 && cell_schemas.count != 0)
   {
     result.cfg = rd_cfg_from_eval_space(cell->eval.space);
   }