added filtering by date