Fixes #139 - Broken URL Segment CMS Links

Fixes issue #139 using normann's solution that seems to work perfectly with both long and short links.