i'm aware there's not a ton of context (the issue link is above) but i now don't think we need further engine changes to implement

--query

in any way i can think of