small refactoring in user-org finder