Revert back to Underlined Highlighting to debug the slowness