Renamed __query__ to __rowquery__