u/fjammes/dm-1446

Reviewing DM-1446
May be worth adding quotation marks around substitutions which can potentially have spaces in them.