year_filters, move things around