1.64 fix query bug