Fixing highlight bug as per custom req.

Adding support for highlighting for our features
such as bulk edit