diff --git a/PARR.API/Controllers/V1/JobController.cs b/PARR.API/Controllers/V1/JobController.cs
index 2e74961e..601ee61e 100644
--- a/PARR.API/Controllers/V1/JobController.cs
+++ b/PARR.API/Controllers/V1/JobController.cs
@@ -33,10 +33,7 @@ namespace PARR.API.Controllers.V1
         private readonly IUriService uriService;
         private readonly IJobService jobService;
         private readonly ITemplateService templateService;
-        private readonly IJobGroupService jobGroupService;
         private readonly IValidator<JobRequest> jobValidator;
-        private readonly IUnitFilterService unitFilterService;
-        private readonly IUnitService unitService;
 
         public JobController(
             ILogger<JobController> logger,
@@ -55,10 +52,7 @@ namespace PARR.API.Controllers.V1
             this.uriService = uriService;
             this.jobService = jobService;
             this.templateService = templateService;
-            this.jobGroupService = jobGroupService;
             this.jobValidator = jobValidator;
-            this.unitFilterService = unitFilterService;
-            this.unitService = unitService;
         }
 
         /// <summary>
@@ -88,10 +82,10 @@ namespace PARR.API.Controllers.V1
 
                 query = query
                     .Include(t => t.UnitFilters)
-                        .ThenInclude(t => t.FieldFilters.OrderBy(o => o.UnitField!.AihitName))
+                        .ThenInclude(t => t.FieldFilters)
                             .ThenInclude(t => t.UnitField)
                     .Include(t => t.UnitFilters)
-                        .ThenInclude(t => t.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName))
+                        .ThenInclude(t => t.RelationshipFilters)
                             .ThenInclude(t => t.UnitField);
             }
 
@@ -186,10 +180,10 @@ namespace PARR.API.Controllers.V1
                                 .Include(t => t.Tnk)
                                 .Include(t => t.Group)
                                 .Include(t => t.UnitFilters)
-                                    .ThenInclude(t => t.FieldFilters.OrderBy(o => o.UnitField!.AihitName))
+                                    .ThenInclude(t => t.FieldFilters)
                                         .ThenInclude(t => t.UnitField)
                                 .Include(t => t.UnitFilters)
-                                    .ThenInclude(t => t.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName))
+                                    .ThenInclude(t => t.RelationshipFilters)
                                 .FirstOrDefaultAsync(t => t.Id == job.Id);
 
             var locationUri = uriService.GetUri(ApiRoutes.Job.Get, ApiRoutes.Job.getParam, createdJob!.Id);
diff --git a/PARR.API/Validators/JobRequestValidator.cs b/PARR.API/Validators/JobRequestValidator.cs
index b8d3915d..e9c7d114 100644
--- a/PARR.API/Validators/JobRequestValidator.cs
+++ b/PARR.API/Validators/JobRequestValidator.cs
@@ -62,17 +62,18 @@ namespace PARR.API.Validators
                 if (string.IsNullOrEmpty(unitFilter.UnitFilterMask))
                     return false;
 
-                if (unitFilter.FieldFilters == null || !unitFilter.FieldFilters.Any())
-                    return false;
+                //if (unitFilter.FieldFilters == null || !unitFilter.FieldFilters.Any())
+                //    return false;
 
-                foreach (var fieldFilter in unitFilter.FieldFilters)
-                {
-                    var fieldId = fieldFilter.FieldId;
-                    if (await unitFieldService.GetAsync(fieldId) == null)
-                        return false;
-                }
+                if (unitFilter.FieldFilters != null && unitFilter.FieldFilters.Any())
+                    foreach (var fieldFilter in unitFilter.FieldFilters)
+                    {
+                        var fieldId = fieldFilter.FieldId;
+                        if (await unitFieldService.GetAsync(fieldId) == null)
+                            return false;
+                    }
 
-                if (unitFilter.RelationshipFilters != null || unitFilter.FieldFilters.Any())
+                if (unitFilter.RelationshipFilters != null && unitFilter.RelationshipFilters.Any())
                     foreach (var relationshipFilter in unitFilter.RelationshipFilters!)
                     {
                         var fieldId = relationshipFilter.FieldId;