parsing &highlighting of conditions improved