Added search highlighting and trailing whitespace highlighting