* code cleanup
* fixed problem with hyperlink highlight and semantic highlight conflicts