diff --git a/WebCms/Controllers/QueueController.cs b/WebCms/Controllers/QueueController.cs
index 2ac62bf..0d5c068 100644
--- a/WebCms/Controllers/QueueController.cs
+++ b/WebCms/Controllers/QueueController.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.Caching;
@@ -20,13 +19,13 @@ namespace LeafWeb.WebCms.Controllers
 	{
 		private const int TimeSamples = 40;
 
-		public ActionResult Index(LeafDataQuery query)
+		public ActionResult Index(LeafDataQuery model)
         {
 			var resultItems =
 				DataService.GetLeafInputsOrdered();
 
 			resultItems 
-                = QueryFilter.Search(resultItems, query, Members.GetCurrentLoginStatus()?.Email);
+                = QueryFilter.Search(resultItems, model, Members.GetCurrentLoginStatus()?.Email);
 
             var timeInProgressEstimater = TimeInProgressEstimater();
 
@@ -36,7 +35,7 @@ namespace LeafWeb.WebCms.Controllers
 			{
 				Items = resultItems,
                 ServerDescription = serviceDescription,
-                Q = query,
+                Q = model,
 				TimeInProgressEstimater = timeInProgressEstimater
 			};
 
@@ -45,14 +44,14 @@ namespace LeafWeb.WebCms.Controllers
 
 
         [HttpPost]
-        public ActionResult Search(LeafDataQuery query)
+        public ActionResult Search(LeafDataQuery model)
         {
             if (!ModelState.IsValid)
             {
                 return CurrentUmbracoPage();
             }
 
-            return RedirectToCurrentUmbracoPage(query.GetNameValueCollection());
+            return RedirectToCurrentUmbracoPage(model.GetNameValueCollection());
         }
 
         private TimeInProgressEstimater TimeInProgressEstimater()
diff --git a/WebCms/Controllers/ResultsController.cs b/WebCms/Controllers/ResultsController.cs
index d902762..c427b2f 100644
--- a/WebCms/Controllers/ResultsController.cs
+++ b/WebCms/Controllers/ResultsController.cs
@@ -10,21 +10,21 @@ namespace LeafWeb.WebCms.Controllers
 	public class ResultsController : BaseController
 	{
         [MemberAuthorize(AllowGroup = "Authenticated")]
-        public ActionResult Index(LeafDataQuery query)
+        public ActionResult Index(LeafDataQuery model)
         {
-            if (!query.HasParameters && !TempData.ContainsKey("Posted"))
-                query.usr = true;
+            if (!model.HasParameters && !TempData.ContainsKey("Posted"))
+                model.usr = true;
 
             var resultItems =
                 DataService.GetLeafInputsOrdered();
 
             resultItems = 
-                QueryFilter.Search(resultItems, query, Members.GetCurrentLoginStatus()?.Email);
+                QueryFilter.Search(resultItems, model, Members.GetCurrentLoginStatus()?.Email);
 
             var searchViewModel = new SearchViewModel
             {
                 Items = resultItems,
-                Q = query
+                Q = model
             };
 
             return View(searchViewModel);
@@ -32,7 +32,7 @@ namespace LeafWeb.WebCms.Controllers
 
         [MemberAuthorize(AllowGroup = "Authenticated")]
         [HttpPost]
-        public ActionResult Search(LeafDataQuery query)
+        public ActionResult Search(LeafDataQuery model)
         {
             if (!ModelState.IsValid)
             {
@@ -41,7 +41,7 @@ namespace LeafWeb.WebCms.Controllers
 
             TempData["Posted"] = true;
 
-            return RedirectToCurrentUmbracoPage(query.GetNameValueCollection());
+            return RedirectToCurrentUmbracoPage(model.GetNameValueCollection());
         }
 
         [MemberAuthorize(AllowGroup = "Authenticated")]