Improved handling of highlights: now taking last ranking before the new
is calculated.