Added highlighting with unhighlight refresh