Better logic on users filtering with organization select