Fix issues preventing an ampersand or apostrophe being used in supplier code