Refactor organization labels for API
Fix label validation