That query looks fine to me, I'll tweak the code.

Yep I need to fix up Q10 a bit.