Improve highlight of long lines