Same markup for titles following these issues: #278 and #277