String highlighting improved.