Improve highlight and Org tags