added form and year filter