Fix to get latest CV per type