improvement: adding custom fields to alert event and incident