DUP: use a more elegant style when handling some queries

[Annopaolo]

• I have read CONTRIBUTING.md and CODE_OF_CONDUCT.md
• I have added to CHANGELOG.md relevant changes and any other user facing change
• I have added or ran the appropriate tests

What this PR does / why we need it:

Some relevant comments were left after a merged PR. Implement them.

Which issue(s) this PR fixes:

See @noaccOS comments in #1104 .

Does this PR introduce a user-facing change?

• Yes
• No

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.74%. Comparing base (b681b39) to head (8c24671).
Report is 4 commits behind head on release-1.2.

Additional details and impacted files

@@               Coverage Diff               @@
##           release-1.2    #1123      +/-   ##
===============================================
+ Coverage        68.72%   68.74%   +0.01%     
===============================================
  Files              323      323              
  Lines             7467     7464       -3     
===============================================
- Hits              5132     5131       -1     
+ Misses            2335     2333       -2     

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

[noaccOS]

👍 to myself