Better query fix.