Added basic highlighting support and modified client demo app to have popup for highlight.