diff --git a/src/main/asciidoc/models/design/order.puml b/src/main/asciidoc/models/design/order.puml
index df344f6..46e3fbe 100644
--- a/src/main/asciidoc/models/design/order.puml
+++ b/src/main/asciidoc/models/design/order.puml
@@ -32,23 +32,31 @@ package order {
     class OrderController {
         +OrderController(oM: OrderManagement<CustomOrder>, cOR: CustomOrderRepository, inv: UniqueInventory<UniqueInventoryItem>, cat: CateringCatalog, stM: StaffManagement)
         +orders(model: Model, userAccount: Optional<UserAccount>): String
-        +orders(model: Model): String
-        +orders(model: Model, String day): String
+        +ordersForAdmin(model: Model, form: OrderQueryForm): String
+        +ordersForAdmin(model: Model, day: String, form: OrderQueryForm): String
         ~initializeCart(): CustomCart
         +event(model: Model, cart: CustomCart): String
         +addEmployeeToCart(empId: long, cart: CustomCart): String
         +removeEmployeeFromCart(empId: long, cart: CustomCart): String
         +removeOrder(orderId: Order.OrderIdentifier, userAccount: Optional<UserAccount>): String
-        +addProduct(product: Product, number: int, cart: CustomCart): String
+        +addProduct(product: Optional<Product>, number: int, cart: CustomCart): String
         +removeProduct(itemId: String, cart: CustomCart): String
         +changeDate(start: LocalDate, startHour: Optional<Integer>, finish: LocalDate, finishHour: Optional<Integer>, cart: CustomCart): String
         +checkout(cart: CustomCart, userAccount: Optional<UserAccount>): String
+        +orderError(): String
         +changeOrderType(orderType: String, cart: CustomCart): String
         +{static}findFreeAmountInInterval(product: Rentable, start: LocalDatetime, finish: LocalDatetime, inv: UniqueInventory<UniqueInventoryItem>, cOR: CustomOrderRepository): Quantity
         +calender(model: Model): String
         +invoice(model: Model, userAccount: UserAccount, order: Order): String
     }
 
+    class OrderQueryForm {
+        -orderStatus: Optional<OrderStatus>
+        +of(order: CustomOrder): OrderQueryForm
+        +getOrderStatus(): Optional<OrderStatus>
+        +setOrderStatus(orderStatus: Optional<OrderStatus>)
+    }
+
     interface CustomOrderRepository {
         +findOrdersByInterval(start: LocalDateTime, finish: LocalDateTime): Streamable<CustomOrder>
     }
@@ -96,6 +104,7 @@ OrderController o--------> staff.StaffManagement: -staffManagement
 OrderController ........> Product
 OrderController ........> Cash
 OrderController ........> OrderStatus
+OrderController ........> OrderQueryForm
 
 OrderController ........> UserAccount
 OrderController ........> time.LocalDate
diff --git a/src/main/asciidoc/models/design/order.svg b/src/main/asciidoc/models/design/order.svg
index b2a11a4..e56218a 100644
--- a/src/main/asciidoc/models/design/order.svg
+++ b/src/main/asciidoc/models/design/order.svg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54e8e0edf92f429dba26f0caba97b674db609d5e021e8789d2a34feca6b04e47
-size 63245
+oid sha256:595bffba274d800969ed3bd35c09fe091f169ab378fb68f56dd5b732c8ac225c
+size 70564