little better handling of content and excerpt