fix: query generation

[amitksingh1490]

Summary:
Briefly describe the changes made in this PR.

Issue Reference(s):
Fixes #... (Replace "..." with the issue number)

Build & Testing:

• [ ] I ran cargo test successfully.
• [ ] I have run ./lint.sh --mode=fix to fix all linting issues raised by ./lint.sh --mode=check.

Checklist:

• [ ] I have added relevant unit & integration tests.
• [ ] I have updated the documentation accordingly.
• [ ] I have performed a self-review of my code.
• [ ] PR follows the naming convention of <type>(<optional scope>): <title>

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 85.91%. Comparing base (96200d2) to head (1e6f29a).

Additional details and impacted files

```diff @@ Coverage Diff @@ ## main #2229 +/- ## ======================================= Coverage 85.90% 85.91% ======================================= Files 211 211 Lines 19984 19993 +9 ======================================= + Hits 17168 17177 +9 Misses 2816 2816 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.