Minor refactoring of Query

[Tigrov]

Q	A
Is bugfix?	❌
New feature?	❌
Breaks BC?	❌
Fixed issues

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.62%. Comparing base (30f64dd) to head (b6fda7d).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff            @@
##             master    #1116   +/-   ##
=========================================
  Coverage     98.62%   98.62%           
+ Complexity     1655     1654    -1     
=========================================
  Files           120      120           
  Lines          4304     4305    +1     
=========================================
+ Hits           4245     4246    +1     
  Misses           59       59           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.