I see what you mean, but personally I prefer to not support `query` here.