use facility from message instead of type, support for custom fields