Fix custom field groups on generic SP fields in incident mgt

Uncategorized