Update OrderQuery and testcase