added filtering by week