Fixed four scenarios in organization feature