WCMS-275 p tags will now be favored over line breaks