Remove nowarp for highlight, and fixed anchors