* Only check subscription count for orgs * Undo constants change --------- Co-authored-by: alannnc <[email protected]>