Do not highlight for patterns which match everything
Merge branch 'improve-highlight' into dev