Fix linebreak issues with some entries