improve highlight mechanism