Refs #3619 - improves escaping of values in wizard