Cleans up all the places where we explicitly set `static: false` on queries. PR Close #33015
PR Close #25561