diff --git a/ScrumTaskboard/Controllers/CategoriesController.cs b/ScrumTaskboard/Controllers/CategoriesController.cs
index 7cffa97..109c22b 100644
--- a/ScrumTaskboard/Controllers/CategoriesController.cs
+++ b/ScrumTaskboard/Controllers/CategoriesController.cs
@@ -22,7 +22,8 @@ namespace ScrumTaskboard.Controllers
         [HttpGet]
         public async Task<ActionResult<IEnumerable<ScrumCategory>>> GetCategory()
         {
-            IEnumerable<ScrumCategory> filtered = _context.Categories;
+            var filtered = _context.Categories.AsQueryable();
+
             if (HttpContext.Request.Query["title"].ToString() != "")
             {
                 filtered = filtered.Where<ScrumCategory>(c => c.title.Contains(HttpContext.Request.Query["title"].ToString()));
@@ -37,8 +38,7 @@ namespace ScrumTaskboard.Controllers
 
             }
 
-
-            return filtered.ToList();
+            return await filtered.ToListAsync();
         }
 
         // GET: api/category/1
diff --git a/ScrumTaskboard/Controllers/ProjectsController.cs b/ScrumTaskboard/Controllers/ProjectsController.cs
index 3092647..8149449 100644
--- a/ScrumTaskboard/Controllers/ProjectsController.cs
+++ b/ScrumTaskboard/Controllers/ProjectsController.cs
@@ -22,7 +22,8 @@ namespace ScrumTaskboard.Controllers
         [HttpGet]
         public async Task<ActionResult<IEnumerable<ScrumProject>>> GetProject()
         {
-            IEnumerable<ScrumProject> filtered = _context.Projects;
+            var filtered = _context.Projects.AsQueryable();
+
             if (HttpContext.Request.Query["title"].ToString() != "")
             {
                 filtered = filtered.Where<ScrumProject>(t => t.title.Contains(HttpContext.Request.Query["title"].ToString()));
@@ -32,7 +33,7 @@ namespace ScrumTaskboard.Controllers
                 filtered = filtered.Where<ScrumProject>(t => t.isprivate == Convert.ToBoolean(HttpContext.Request.Query["isprivate"]));
             }
 
-            return filtered.ToList();
+            return await filtered.ToListAsync();
         }
 
         // GET: api/projects/5
diff --git a/ScrumTaskboard/Controllers/SprintsController.cs b/ScrumTaskboard/Controllers/SprintsController.cs
index 45fe7af..2144fcf 100644
--- a/ScrumTaskboard/Controllers/SprintsController.cs
+++ b/ScrumTaskboard/Controllers/SprintsController.cs
@@ -22,7 +22,8 @@ namespace ScrumTaskboard.Controllers
         [HttpGet]
         public async Task<ActionResult<IEnumerable<ScrumSprint>>> GetSprint()
         {
-            IEnumerable<ScrumSprint> filtered = _context.Sprints;
+            var filtered = _context.Sprints.AsQueryable();
+
             if (HttpContext.Request.Query["title"].ToString() != "")
             {
                 filtered = filtered.Where<ScrumSprint>(s => s.title.Contains(HttpContext.Request.Query["title"].ToString()));
@@ -40,7 +41,7 @@ namespace ScrumTaskboard.Controllers
                 filtered = filtered.Where<ScrumSprint>(s => s.endDate == DateTime.Parse(HttpContext.Request.Query["startDate"].ToString()));
             }
 
-            return filtered.ToList();
+            return await filtered.ToListAsync();
         }
 
         // GET: api/sprint/5
diff --git a/ScrumTaskboard/Controllers/StatusController.cs b/ScrumTaskboard/Controllers/StatusController.cs
index d695715..518e920 100644
--- a/ScrumTaskboard/Controllers/StatusController.cs
+++ b/ScrumTaskboard/Controllers/StatusController.cs
@@ -21,13 +21,14 @@ namespace ScrumTaskboard.Controllers
         [HttpGet]
         public async Task<ActionResult<IEnumerable<ScrumStatus>>> GetStatus()
         {
-            IEnumerable<ScrumStatus> filtered = _context.Status;
+            var filtered = _context.Status.AsQueryable();
+
             if (HttpContext.Request.Query["title"].ToString() != "")
             {
                 filtered = filtered.Where<ScrumStatus>(s => s.title.Contains(HttpContext.Request.Query["title"].ToString()));
             }
 
-            return filtered.ToList();
+            return await filtered.ToListAsync();
         }
 
         // GET: api/status/1
diff --git a/ScrumTaskboard/Controllers/TasksController.cs b/ScrumTaskboard/Controllers/TasksController.cs
index 9f54b97..5859d44 100644
--- a/ScrumTaskboard/Controllers/TasksController.cs
+++ b/ScrumTaskboard/Controllers/TasksController.cs
@@ -22,7 +22,8 @@ namespace ScrumTaskboard.Controllers
         [HttpGet]
         public async Task<ActionResult<IEnumerable<ScrumTask>>> GetTasks()
         {
-            IEnumerable<ScrumTask> filtered = _context.Tasks;
+            var filtered = _context.Tasks.AsQueryable();
+
             if (HttpContext.Request.Query["title"].ToString() != "")
             {
                 filtered = filtered.Where<ScrumTask>(t => t.title.Contains(HttpContext.Request.Query["title"].ToString()));
@@ -52,10 +53,10 @@ namespace ScrumTaskboard.Controllers
                 ScrumPrio priority;
                 Enum.TryParse<ScrumPrio>(HttpContext.Request.Query["priority"].ToString(), out priority);
                 filtered = filtered.Where<ScrumTask>(t => t.priority == priority);
-            }
-           
-
-            return filtered.ToList();
+            }
+
+
+            return await filtered.ToListAsync();
         }
 
         // GET: api/tasks/5
diff --git a/ScrumTaskboard/Controllers/UsersController.cs b/ScrumTaskboard/Controllers/UsersController.cs
index 1194d08..a8d4b7c 100644
--- a/ScrumTaskboard/Controllers/UsersController.cs
+++ b/ScrumTaskboard/Controllers/UsersController.cs
@@ -21,13 +21,13 @@ namespace ScrumTaskboard.Controllers
         [HttpGet]
         public async Task<ActionResult<IEnumerable<ScrumUser>>> GetUser()
         {
-            IEnumerable<ScrumUser> filtered = _context.Users;
+            var filtered = _context.Users.AsQueryable();
             if (HttpContext.Request.Query["name"].ToString() != "")
             {
                 filtered = filtered.Where<ScrumUser>(u => u.name.Contains(HttpContext.Request.Query["name"].ToString()));
             }
 
-            return filtered.ToList();
+            return await filtered.ToListAsync();
         }
 
         // GET: api/sprint/5
diff --git a/ScrumTaskboard/Controllers/UserstoriesController.cs b/ScrumTaskboard/Controllers/UserstoriesController.cs
index 2537074..861b449 100644
--- a/ScrumTaskboard/Controllers/UserstoriesController.cs
+++ b/ScrumTaskboard/Controllers/UserstoriesController.cs
@@ -22,7 +22,8 @@ namespace ScrumTaskboard.Controllers
         [HttpGet]
         public async Task<ActionResult<IEnumerable<ScrumUserstory>>> GetUserstory()
         {
-            IEnumerable<ScrumUserstory> filtered = _context.Userstories;
+            var filtered = _context.Userstories.AsQueryable();
+
             if (HttpContext.Request.Query["title"].ToString() != "")
             {
                 filtered = filtered.Where<ScrumUserstory>(t => t.title.Contains(HttpContext.Request.Query["title"].ToString()));
@@ -55,7 +56,7 @@ namespace ScrumTaskboard.Controllers
             }
 
 
-            return filtered.ToList();
+            return await filtered.ToListAsync();
         }
 
         // GET: api/userstories/1