Made org identifiers work by matching up combo type for identifier