I think I'll just keep things as is with this PR. This is consistent in implementation with the rest of the file. I agree showing those query bugs is a bad idea. But that's probably a separate PR.