Updated the custom field formatter