diff --git a/UserService.DatabaseLayer/Repository/BaseRepository.cs b/UserService.DatabaseLayer/Repository/BaseRepository.cs
index 7df73ec..c9e58b0 100644
--- a/UserService.DatabaseLayer/Repository/BaseRepository.cs
+++ b/UserService.DatabaseLayer/Repository/BaseRepository.cs
@@ -24,7 +24,7 @@ namespace UserService.DatabaseLayer.Repository
             await using var db = new UserServiceDbContext();
 
             IQueryable<T> queryable = Context(db).Include(x => x.Parent);
-            if(queryable != null) queryable = queryable.Where(predicate);
+            if(predicate != null) queryable = queryable.Where(predicate);
             return await queryable.ToListAsync(token);
         }
 
diff --git a/UserService/Pages/Directory.razor.cs b/UserService/Pages/Directory.razor.cs
index 4a7ac5c..31b6510 100644
--- a/UserService/Pages/Directory.razor.cs
+++ b/UserService/Pages/Directory.razor.cs
@@ -26,9 +26,12 @@ namespace UserService.Pages
 
         private async void OnSelectedNodeChanged(Node? value)
         {
-            Members = await UsersRepository.GetAllAsync();
+            if (value == null) return;
+            Members = await UsersRepository.GetAllAsync(x => x.ParentId == value.Id);
         }
 
+        public IReadOnlyList<Member> Members { get; set; }
+
         [Inject] public IOrganizationUnitsRepository OuRepository { get; set; }
 
         [Inject] public IUsersRepository UsersRepository { get; set; }