entry-header line breaks
merge, overriding previous entry header fix with better one