Changed handling of Markdown and Html entries