Thanks for the heads-up. So #462 is already doing it, I'll skip it (I meant overriding it with the query one too).