Added filters for year & buckets