Ensure query is only used once per query, rather than per source#250

will-langdale wants to merge 4 commits intomainuktrade/matchbox:mainfrom

feature/one-transferuktrade/matchbox:feature/one-transferCopy head branch name to clipboard