Fixed more bugs with weekly report. Redesigned the query.