🚀 Feature: Refactor Queries

[stnguyen90]

🔖 Feature description

The last Query Refactor had some changes that could be improved, but we rushed forward due to lack of time.

🎤 Pitch

• [ ] #191
• [ ] #193
• [x] #192

👀 Have you spent some time to check if this issue has been raised before?

• [X] I checked and didn't find similar issue

🏢 Have you read the Code of Conduct?

• [X] I have read the Code of Conduct