Improved highlights calculation (removing duplicates, etc)