Better support for punctuation, lists and multi-line titles