updating fix looping issue and check team
Check for organization member, not team member