Further Refinements of entry-content