Adding missing group by and Week