YH-620: refactor organization list