diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ImplementerStorage.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ImplementerStorage.cs
index fc0f124..744e8b8 100644
--- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ImplementerStorage.cs
+++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ImplementerStorage.cs
@@ -26,23 +26,18 @@ namespace PlumbingRepairDatabaseImplement.Implements
 
 		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
 		{
+			if (string.IsNullOrEmpty(model.ImplementerFIO) &&
+				string.IsNullOrEmpty(model.Password) &&
+				!model.Id.HasValue)
+			{
+				return null;
+			}
 			using var context = new PlumbingRepairDataBase();
-			if (model.Id.HasValue)
-			{
-				return context.Implementers
-				.FirstOrDefault(x => (x.Id == model.Id))?.GetViewModel;
-			}
-			else if (!string.IsNullOrEmpty(model.ImplementerFIO) && !string.IsNullOrEmpty(model.Password))
-			{
-				return context.Implementers
-				.FirstOrDefault(x => (x.ImplementerFIO == model.ImplementerFIO && x.Password == model.Password))?.GetViewModel;
-			}
-			else if (!string.IsNullOrEmpty(model.ImplementerFIO))
-			{
-				return context.Implementers
-				.FirstOrDefault(x => (x.ImplementerFIO == model.ImplementerFIO))?.GetViewModel;
-			}
-			return new();
+			return context.Implementers
+			.FirstOrDefault(x => (string.IsNullOrEmpty(model.ImplementerFIO) || x.ImplementerFIO == model.ImplementerFIO) &&
+								 (string.IsNullOrEmpty(model.Password) || x.Password == model.Password) &&
+								 (!model.Id.HasValue || x.Id == model.Id))
+			?.GetViewModel;
 		}
 
 		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
diff --git a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs
index 9cdca71..b320120 100644
--- a/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs
+++ b/PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs
@@ -86,10 +86,9 @@ namespace PlumbingRepairDatabaseImplement.Implements
 				.Include(x => x.Work)
 				.Include(x => x.Client)
 				.Include(x => x.Implementer)
-				.FirstOrDefault(x => (model.Status == null || model.Status != null && model.Status == x.Status) &&
-						model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
-						model.Id.HasValue && x.Id == model.Id)
-				?.GetViewModel;
+				.FirstOrDefault(x => (!model.ImplementerId.HasValue || x.ImplementerId == model.ImplementerId) &&
+									  (!model.Status.HasValue || x.Status == model.Status) &&
+									  (!model.Id.HasValue || x.Id == model.Id))?.GetViewModel;
 		}
 
         public OrderViewModel? Insert(OrderBindingModel model)