diff --git a/src/demon/win32/demon_os_win32.c b/src/demon/win32/demon_os_win32.c
index 1366cb49..435d13ee 100644
--- a/src/demon/win32/demon_os_win32.c
+++ b/src/demon/win32/demon_os_win32.c
@@ -432,6 +432,7 @@ demon_os_run(Arena *arena, DEMON_OS_RunCtrls *ctrls){
           DEMON_Event *e = demon_push_event(arena, &result, DEMON_EventKind_UnloadModule);
           e->process = demon_ent_handle_from_ptr(process);
           e->module = demon_ent_handle_from_ptr(child);
+          e->string = demon_os_full_path_from_module(arena, child);
         }
       }
       
diff --git a/src/df/gfx/df_views.c b/src/df/gfx/df_views.c
index 91393970..c9e1099e 100644
--- a/src/df/gfx/df_views.c
+++ b/src/df/gfx/df_views.c
@@ -272,9 +272,9 @@ df_process_info_list_from_query(Arena *arena, String8 query)
       
       // rjf: determine if this item is filtered out
       B32 matches_query = (query.size == 0 ||
-                           (attached_match_ranges.count >= attached_match_ranges.needle_part_count) ||
-                           (name_match_ranges.count >= name_match_ranges.needle_part_count) ||
-                           (pid_match_ranges.count >= pid_match_ranges.needle_part_count));
+                           (attached_match_ranges.needle_part_count != 0 && attached_match_ranges.count >= attached_match_ranges.needle_part_count) ||
+                           (name_match_ranges.count != 0 && name_match_ranges.count >= name_match_ranges.needle_part_count) ||
+                           (pid_match_ranges.count != 0 && pid_match_ranges.count >= pid_match_ranges.needle_part_count));
       
       // rjf: push if unfiltered
       if(matches_query)
@@ -4019,7 +4019,9 @@ DF_VIEW_UI_FUNCTION_DEF(Scheduler)
               {
                 DF_CmdParams params = df_cmd_params_from_view(ws, panel, view);
                 params.entity = df_handle_from_entity(entity);
+                df_handle_list_push(scratch.arena, &params.entity_list, df_handle_from_entity(entity));
                 df_cmd_params_mark_slot(&params, DF_CmdParamSlot_Entity);
+                df_cmd_params_mark_slot(&params, DF_CmdParamSlot_EntityList);
                 df_push_cmd__root(&params, df_cmd_spec_from_core_cmd_kind(DF_CoreCmdKind_Detach));
               }
             }