query fix again.