improve cue handling a bit