Query changes that return more correct data than before. There still seem to be some incorrect returns... looking in to it.