#854 Do not add pharagraph tags when not needed