Allow original without cd name
Always return safestring on renamer replace
Merge branch 'develop'