Add filtering for months and years