query fix 2