Jira Macro column values not appearing when Custom Field (Jira) name contains comma or semicolon

Summary

When JIRA Custom Fields name contains comma (,) or ( JIRA Macro identify the them as separators and does not include the field values in the JIRA Macro table generated in Confluence

Steps to Reproduce

1. Create a custom field that include a comma or semicolon, add value.
2. Create a JIRA Macro in a Confluence page
3. Include the custom field that contains a comma or semicolon
4. Publish page. 

Screenshot from 2017-10-25 18.30.04.png Screenshot from 2017-10-25 18.31.26.png

Expected Results

Values are shown in Custom field column

Actual Results

Empty values are shown and the header is separated where the commas or semicolons are positioned.

Workaround  

Remove commas from JIRA Custom Fields