Almost done with year filter