Improved multi cue points management.