Issue Summary

Using a custom Jira field named "Component" on "Insert Jira Issue/Filter" macro is mixed up with default field "Component/s".

Steps to Reproduce

1. Create on Jira a custom field named "Component".
2. Use on the linked Confluence instance the "insert Jira Issue/Filter" macro.
3. While editing the macro, under "Display Options" select as a column to display the custom field "Component" created earlier.
4. Save and view the page.

Expected Results

The custom field/column "Component" will be displayed by Confluence.

Actual Results

The default field/column "Component/s" is displayed instead.

The storage format displays the correct column:

  <ac:structured-macro ac:macro-id="4fb34645-1aad-4c9b-b961-aa28fc5b5d2c" ac:name="jira" ac:schema-version="1">
    <ac:parameter ac:name="server">Jira</ac:parameter>
    <ac:parameter ac:name="columnIds">issuekey,summary,issuetype,created,updated,duedate,assignee,reporter,priority,status,resolution,customfield_10202</ac:parameter>
    <ac:parameter ac:name="columns">key,summary,type,created,updated,due,assignee,reporter,priority,status,resolution,Component</ac:parameter>
    <ac:parameter ac:name="maximumIssues">20</ac:parameter>
    <ac:parameter ac:name="jqlQuery">key = bla-10        </ac:parameter>
    <ac:parameter ac:name="serverId">7a483d39-9c18-33e8-a4d1-2c4fd3b3e70b</ac:parameter>
  </ac:structured-macro>

 But in the actual page, it shows the column "Component's" instead:

Workaround

No workaround other than renaming the custom column to something more distinct.