ref(on-demand): Improve query builder integration

[iambriccardo]

This PR fixes an issue introduced in #54441.

[codecov]

Codecov Report

Merging #54446 (c04d377) into master (cac31d6) will increase coverage by 0.01%.
Report is 59 commits behind head on master.
The diff coverage is 86.79%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #54446      +/-   ##
==========================================
+ Coverage   79.64%   79.66%   +0.01%     
==========================================
  Files        4986     4989       +3     
  Lines      211350   211590     +240     
  Branches    36032    36067      +35     
==========================================
+ Hits       168332   168556     +224     
- Misses      37833    37841       +8     
- Partials     5185     5193       +8     

Files Changed	Coverage Δ
src/sentry/search/events/builder/metrics.py	81.77% <85.41%> (-0.71%)	⬇️
src/sentry/incidents/serializers/alert_rule.py	90.09% <100.00%> (ø)
src/sentry/search/events/builder/discover.py	91.88% <100.00%> (+0.02%)	⬆️

... and 125 files with indirect coverage changes