Refactor query loading #154207
+50
−82
Merged
Refactor query loading #154207
Loading