Bugfix for highlights and preparation for break columns