added id to hightlight and selection.