minor: refactor stores/queries code

[geclos]

Describe your changes

Improve a bit the code as it was quite hard to follow

Checklist before requesting a review

• [x] I have added thorough tests
• [x] I have updated the documentation if necessary
• [x] I have added a human-readable description of the changes for the release notes
• [x] I have included a recorded video capture of the feature manually tested