Appointments additional fields shortcodes

Hi,
the shortcodes of the additional fields are not working correctly: if the field value is FIELD_APPOINTMENTADDRESS, then the output is FIELD_APPOINTMENT, because ADDRESS is already a shortcode...
What can I do if I need to have a field name that contains the word ADDRESS, and CITY, and I can't edit their text or shortcodes?

Thank you in advance

Andrea