🔜 Non-trivial GraphQL issues 2

🔜 Non-trivial GraphQL issues 2