Refactor organization labels for API
Merge branch 'MH-847' into dev