Fixed highlighting issues