Added week number and name to week query