diff --git a/addons/pos_restaurant/data/pos_restaurant_demo.xml b/addons/pos_restaurant/data/pos_restaurant_demo.xml
index 3eced19f536..3b0ea3debda 100644
--- a/addons/pos_restaurant/data/pos_restaurant_demo.xml
+++ b/addons/pos_restaurant/data/pos_restaurant_demo.xml
@@ -241,7 +241,7 @@
             <field name="combo_price">0</field>
         </record>
         <record id="burger_combo" model="pos.combo">
-            <field name="name">Burger Choice</field>
+            <field name="name">Burgers Choice</field>
             <field name="combo_line_ids" eval="[(6, 0, [ref('cheeseburger_combo_line'), ref('bacon_burger_combo_line')])]"/>
         </record>
 
@@ -262,7 +262,7 @@
             <field name="combo_price">2</field>
         </record>
         <record id="drink_combo" model="pos.combo">
-            <field name="name">Desks Combo</field>
+            <field name="name">Drinks choice</field>
             <field name="combo_line_ids" eval="[(6, 0, [ref('coke_combo_line'), ref('water_combo_line'), ref('maid_combo_line'), ref('milkshake_combo_line')])]"/>
         </record>
 
diff --git a/addons/pos_self_order/models/res_config_settings.py b/addons/pos_self_order/models/res_config_settings.py
index fd8b5681363..596e9b0167b 100644
--- a/addons/pos_self_order/models/res_config_settings.py
+++ b/addons/pos_self_order/models/res_config_settings.py
@@ -103,12 +103,12 @@ class ResConfigSettings(models.TransientModel):
 
             for table in table_ids:
                 qr_images.append({
-                    'image': self._generate_single_qr_code(self.pos_config_id._get_self_order_url(table.id)),
+                    'image': self._generate_single_qr_code(url_unquote(self.pos_config_id._get_self_order_url(table.id))),
                     'name': f"{table.floor_id.name} - {table.name}",
                 })
         else:
             qr_images.append({
-                'image': self._generate_single_qr_code(self.pos_config_id._get_self_order_url()),
+                'image': self._generate_single_qr_code(url_unquote(self.pos_config_id._get_self_order_url())),
                 'name': "generic",
             })
 
diff --git a/addons/pos_self_order/static/src/app/components/loading_overlay/loading_overlay.js b/addons/pos_self_order/static/src/app/components/loading_overlay/loading_overlay.js
index 594f5ddce55..1f5b2458ba2 100644
--- a/addons/pos_self_order/static/src/app/components/loading_overlay/loading_overlay.js
+++ b/addons/pos_self_order/static/src/app/components/loading_overlay/loading_overlay.js
@@ -1,19 +1,16 @@
 /** @odoo-module */
 
-import { Component, onWillStart, useState } from "@odoo/owl";
-import { useSelfOrder } from "@pos_self_order/app/self_order_service";
+import { Component, onMounted, useState } from "@odoo/owl";
 
 export class LoadingOverlay extends Component {
     static template = "pos_self_order.LoadingOverlay";
-    static props = ["action", "removeTopClasses?"];
 
     setup() {
-        this.selfOrder = useSelfOrder();
         this.state = useState({
             loading: false,
         });
 
-        onWillStart(() => {
+        onMounted(() => {
             setTimeout(() => {
                 this.state.loading = true;
             }, 200);
diff --git a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
index a6eb81be2d6..d76bb8364de 100644
--- a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
+++ b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
@@ -14,7 +14,6 @@ export class CartPage extends Component {
     setup() {
         this.selfOrder = useSelfOrder();
         this.router = useService("router");
-        this.sendInProgress = false;
         this.state = useState({
             selectTable: false,
             cancelConfirmation: false,