Another query fix