diff --git a/JewelryStoreFileImplement/Implements/OrderStorage.cs b/JewelryStoreFileImplement/Implements/OrderStorage.cs
index c842781..a9118fb 100644
--- a/JewelryStoreFileImplement/Implements/OrderStorage.cs
+++ b/JewelryStoreFileImplement/Implements/OrderStorage.cs
@@ -47,12 +47,14 @@ namespace JewelryStoreFileImplement.Implements
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
+            if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
             {
-                return new();
+                return source.Orders
+                        .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+                        .Select(x => x.GetViewModel)
+                        .ToList();
             }
-
-            return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => Jewel(x.GetViewModel)).ToList();
+            return source.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
         }
 
         public List<OrderViewModel> GetFullList()