Switch to 'list' type, 'upcoming' is effectively deprecated