Final query fix for today