diff --git a/config/consumer.yml b/config/consumer.yml
index 97d7e8e..a450698 100644
--- a/config/consumer.yml
+++ b/config/consumer.yml
@@ -12,5 +12,11 @@ db:
   password: password
   database: util
 pollQueues:
-  - queue1
-  - queue2
+  - ticketFreeze
+  - ticketIsTaxDataChecked
+  - ticketRequest
+  - ticketIsTooLittle
+  - clientRisk
+  - ticketRisk
+  - saleRounding
+  - saleComponentLack
\ No newline at end of file
diff --git a/config/queues.yml b/config/queues.yml
deleted file mode 100644
index 9a4763a..0000000
--- a/config/queues.yml
+++ /dev/null
@@ -1,268 +0,0 @@
-orderTotal:
-  query: CALL hedera.order_recalc(:id)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    hedera:
-      order:
-        key: id
-        columns:
-        - id
-        - address_id
-        - company_id
-        - date_send
-        - customer_id
-        events:
-        - updaterows
-      orderRow:
-        key: orderFk
-        columns:
-        - id
-        - orderFk
-        - itemFk
-        - warehouseFk
-        - shipment
-        - amount
-ticketTotal:
-  query: CALL vn.ticket_recalc(:id, NULL)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    vn: 
-      ticket:
-        key: id
-        columns:
-        - id
-        - shipped
-        - warehouseFk
-        - clientFk
-        events:
-        - updaterows
-      sale:
-        key: ticketFk
-        columns:
-        - id
-        - ticketFk
-        - itemFk
-        - quantity
-        - price
-stock:
-  mode: id
-  includeSchema:
-    vn:
-      travel:
-        query: CALL stock.log_refreshBuy(:table, :id)
-        key: id
-      entry:
-        query: CALL stock.log_refreshBuy(:table, :id)
-        key: id
-        columns:
-        - id
-        - travelFk
-        - isRaid
-        events:
-        - updaterows
-      buy:
-        query: CALL stock.log_refreshBuy(:table, :id)
-        key: id
-        columns:
-        - id
-        - entryFk
-        - itemFk
-        - quantity
-        - created
-      ticket:
-        query: CALL stock.log_refreshSale(:table, :id)
-        key: id
-        columns:
-        - id
-        - warehouseFk
-        - shipped
-        events:
-        - updaterows
-      sale:
-        query: CALL stock.log_refreshSale(:table, :id)
-        key: id
-        columns:
-        - id
-        - ticketFk
-        - itemFk
-        - quantity
-        - created
-        - isPicked
-    hedera:
-      order:
-        query: CALL stock.log_refreshOrder(:table, :id)
-        key: id
-        columns:
-        - id
-        - date_send
-        - address_id
-        - company_id
-        - customer_id
-        events:
-        - updaterows
-      orderRow:
-        query: CALL stock.log_refreshOrder(:table, :id)
-        key: id
-ticketRequest: 
-  query: CALL vn.ticket_getRequestProblem(:id)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    vn: 
-      ticket:
-        key: id
-        columns:
-        - id
-      ticketRequest:
-        key: ticketFk
-        columns:
-        - ticketFk
-        - isOk
-ticketFreeze: 
-  query: CALL vn.ticket_getFreezeProblem(:id)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    vn: 
-      client:
-        key: id
-        columns:
-        - id
-        - isFreezed
-        events:
-        - updaterows
-      ticket:
-        key: clientFk
-        columns:
-        - id
-        - clientFk
-ticketIsTaxDataChecked: 
-  query: CALL vn.ticket_getTaxDataCheckedProblem(:id)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    vn: 
-      client:
-        key: id
-        columns:
-        - id
-        - isTaxDataChecked
-        events:
-        - updaterows
-      ticket:
-        key: id
-        columns:
-        - id
-        - clientFk 
-ticketIsTooLittle:
-  query: CALL vn.ticket_getTooLittleProblem(:id)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    vn: 
-      ticket:
-        key: id
-        columns:
-        - id
-        - totalWithoutVat
-        - warehouseFk
-        events:
-        - updaterows
-      sale:
-        key: ticketFk
-        columns:
-        - id
-        - ticketFk
-        - itemFk
-        - quantity
-ticketIsTooLittleItemCost:
- query: CALL vn.ticket_getTooLittleProblemItemCost(:itemFk)
- mode: fk
- flushInterval: 5000
- includeSchema:
-   vn:
-    itemCost:
-      key: itemFk
-      columns:
-      - itemFk
-      - warehouseFk
-      - cm3delivery
-      events:
-      - updaterows
-ticketIsTooLittleConfig:
- query: CALL vn.ticket_getTooLittleProblemConfig()
- mode: fk
- flushInterval: 5000
- includeSchema:
-   vn:
-     volumeConfig:
-       columns:
-       - minTicketVolume
-       - minTicketValue
-saleComponentLack:
-  query: CALL vn.sale_getComponentLackProblem(:id)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    vn: 
-      sale:
-        key: id
-        columns:
-        - id
-      saleComponent:
-        key: saleFk
-        columns:
-        - id
-        - saleFk
-        - componentFk
-saleComponentLackComponent:
-  query: CALL vn.sale_getComponentLackProblem(:id)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    vn:
-      component:
-        key: id
-        columns:
-        - isRequired
-clientRisk:
-  query: CALL vn.client_risk(:clientFk)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    vn:
-      ticket:
-        key: clientFk
-        columns:
-        - id
-        - clientFk
-        - shipped
-        - totalWithtVat
-        - refFk
-      receipt:
-        key: clientFk
-        columns:
-        - payed
-        - clientFk
-        - amountPaid
-    hedera:
-      tpvTransaction:
-        key: clientFk
-        columns:
-        - clientFk
-        - amount
-        - status
-        - receiptFk
-ticketRisk:
-  query: CALL vn.ticket_getRiskProblem(:clientFk)
-  mode: fk
-  flushInterval: 5000
-  includeSchema:
-    vn:
-      ticket:
-        key: clientFk
-        columns:
-        - clientFk
-        - risk
diff --git a/queues/clientRisk.yml b/queues/clientRisk.yml
new file mode 100644
index 0000000..dcbb7ea
--- /dev/null
+++ b/queues/clientRisk.yml
@@ -0,0 +1,30 @@
+query:
+  ticket: CALL vn.ticket_setRisk(:clientFk)
+includeSchema:
+  vn:
+    ticket:
+      key: clientFk
+      columns:
+      - id
+      - clientFk
+      - shipped
+      - totalWithVat
+      - refFk
+    receipt:
+      key: clientFk
+      scope: ticket
+      columns:
+      - payed
+      - clientFk
+      - amountPaid
+  hedera:
+    tpvTransaction:
+      key: clientFk
+      scope: ticket
+      columns:
+      - clientFk
+      - amount
+      - status
+      - receiptFk
+
+
diff --git a/queues/saleComponentLack.yml b/queues/saleComponentLack.yml
new file mode 100644
index 0000000..42c3dcc
--- /dev/null
+++ b/queues/saleComponentLack.yml
@@ -0,0 +1,21 @@
+query:
+  sale: CALL vn.sale_setProblemComponentLack(:id)
+  component:  CALL vn.sale_setProblemComponentLackByComponent(:id)
+includeSchema:
+  vn:
+    sale:
+      key: id
+      columns:
+      - id
+    saleComponent:
+      key: saleFk
+      scope: sale
+      columns:
+      - id
+      - saleFk
+      - componentFk
+    component:
+        key: id
+        columns:
+        - id
+        - isRequired
\ No newline at end of file
diff --git a/queues/saleRounding.yml b/queues/saleRounding.yml
new file mode 100644
index 0000000..ec1ea41
--- /dev/null
+++ b/queues/saleRounding.yml
@@ -0,0 +1,17 @@
+query:
+  ticket: CALL vn.ticket_setProblemRounding(:id)
+  sale: CALL vn.sale_setProblemRounding(:id)
+includeSchema:
+  vn: 
+    ticket:
+      key: id
+      columns:
+      - id
+      - warehouseFk
+      - shipped
+    sale:
+      key: id
+      columns:
+      - id
+      - quantity
+      - itemFk 
\ No newline at end of file
diff --git a/queues/ticketFreeze.yml b/queues/ticketFreeze.yml
new file mode 100644
index 0000000..51bdf70
--- /dev/null
+++ b/queues/ticketFreeze.yml
@@ -0,0 +1,15 @@
+query:
+  client: CALL vn.ticket_setProblemFreeze(:id)
+includeSchema:
+  vn: 
+    client:
+      key: id
+      columns:
+      - id
+      - isFreezed
+    ticket:
+      key: clientFk
+      scope: client
+      columns:
+      - id
+      - clientFk
\ No newline at end of file
diff --git a/queues/ticketIsTaxDataChecked.yml b/queues/ticketIsTaxDataChecked.yml
new file mode 100644
index 0000000..27b3e19
--- /dev/null
+++ b/queues/ticketIsTaxDataChecked.yml
@@ -0,0 +1,15 @@
+query:
+  client: CALL vn.ticket_setProblemTaxDataChecked(:id)
+includeSchema:
+  vn: 
+    client:
+      key: id
+      columns:
+      - id
+      - isTaxDataChecked
+    ticket:
+      key: clientFk
+      scope: client
+      columns:
+      - id
+      - clientFk
\ No newline at end of file
diff --git a/queues/ticketIsTooLittle.yml b/queues/ticketIsTooLittle.yml
new file mode 100644
index 0000000..852b4b6
--- /dev/null
+++ b/queues/ticketIsTooLittle.yml
@@ -0,0 +1,38 @@
+query:
+  ticket: CALL vn.ticket_setProblemTooLittle(:id)
+  item: CALL vn.ticket_setProblemTooLittleItemCost(:itemFk)
+  config: CALL vn.ticket_setProblemTooLittleItemCost(NULL)
+includeSchema:
+  vn: 
+    ticket:
+      key: id
+      columns:
+      - id
+      - totalWithoutVat
+      - warehouseFk
+      events:
+      - updaterows
+    sale:
+      key: ticketFk
+      scope: ticket
+      columns:
+      - id
+      - ticketFk
+      - itemFk
+      - quantity
+    itemCost:
+      key: itemFk
+      scope: item
+      columns:
+      - itemFk
+      - warehouseFk
+      - cm3delivery
+      events:
+      - updaterows
+    volumeConfig:
+      scope: config  
+      columns:
+      - minTicketValue
+      - minTicketVolume
+      events:
+      - updaterows
\ No newline at end of file
diff --git a/queues/ticketRequest.yml b/queues/ticketRequest.yml
new file mode 100644
index 0000000..fcfd7dc
--- /dev/null
+++ b/queues/ticketRequest.yml
@@ -0,0 +1,16 @@
+query:
+  ticket: CALL vn.ticket_setProblemRequest(:id)
+includeSchema:
+  vn: 
+    ticket:
+      key: id
+      columns:
+      - id
+      events:
+      - updaterows
+    ticketRequest:
+      key: ticketFk
+      scope: ticket
+      columns:
+      - ticketFk
+      - isOk
\ No newline at end of file
diff --git a/queues/ticketRisk.yml b/queues/ticketRisk.yml
new file mode 100644
index 0000000..c46bc31
--- /dev/null
+++ b/queues/ticketRisk.yml
@@ -0,0 +1,10 @@
+query:
+  ticket: CALL vn.ticket_setProblemRisk(:id)
+includeSchema:
+  vn:
+    ticket:
+      key: id
+      columns:
+      - id
+      - clientFk
+      - risk
\ No newline at end of file