Remove the squishing logic of highlight

This will keep each section separated rather than squishing them
together and splitting them up.