CONTENT-2318 - Control Bar Module Bookmarking
Highlighting issues fixed