Fix: function signatures for Query().