Revert lengthening of directives
Add defaults for title and subtitle