API change. Query is lazy in default.