Fix last month of year wasn't getting collected, and some minor tweeks to make sure only films in current year get added