Add stricter filters on year