diff --git a/ShipyardListImplement/OrderStorage.cs b/ShipyardListImplement/OrderStorage.cs
index dc37dd6..cbc7c10 100644
--- a/ShipyardListImplement/OrderStorage.cs
+++ b/ShipyardListImplement/OrderStorage.cs
@@ -24,13 +24,12 @@ namespace ShipyardListImplement
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             var result = new List<OrderViewModel>();
-            if (!model.Id.HasValue)
-            {
-                return result;
-            }
+            
             foreach (var order in _source.Orders)
             {
-                if (order.Id == model.Id)
+                if ((!model.Id.HasValue || order.Id == model.Id) &&
+                        (!model.DateFrom.HasValue || order.DateCreate >= model.DateFrom)
+                        && (!model.DateTo.HasValue || order.DateCreate <= model.DateTo))
                 {
                     result.Add(AccessShipStorage(order.GetViewModel));
                 }