Hotfix: When a control name contains a comma, the output mapping is badged