account query fix