Fixes #4972: More robust friendly titles implementation
Merge pull request #5310 from mrclay/4972

Fixes #4972: More robust friendly titles implementation