I'm not sure I understand the problem enough to raise a PR, but I'm happy to raise an issue. I can list out the queries I've seen this with.