fix query cancel problem
Merge branch 'master' into santeon