fixed issues in higlighter