[C-2418] Refactor organization enrichment logic

[yeganathan18]

The current logic of organization enrichment is too complicated and doesn’t really allow any pagination like member enrichment. We should consider simplifying the operation.

_{From SyncLinear.com | C-2418}