same bugfix as master
Bugfix for highlights and preparation for break columns
Merge commit '63928224f9e4ca317309dfb7c89da14f217042af' into breakCols