diff --git a/website_sale_product_assortment/__manifest__.py b/website_sale_product_assortment/__manifest__.py
index dc59ad57eb..29cfe0ff47 100644
--- a/website_sale_product_assortment/__manifest__.py
+++ b/website_sale_product_assortment/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "eCommerce product assortment",
     "summary": "Use product assortments to display products available on e-commerce.",
-    "version": "16.0.1.1.0",
+    "version": "18.0.1.1.0",
     "development_status": "Beta",
     "license": "AGPL-3",
     "category": "Website",
diff --git a/website_sale_product_assortment/tests/test_ui.py b/website_sale_product_assortment/tests/test_ui.py
index 30baa14de4..65d2fae7b1 100644
--- a/website_sale_product_assortment/tests/test_ui.py
+++ b/website_sale_product_assortment/tests/test_ui.py
@@ -18,41 +18,41 @@ def setUp(self):
         )
 
     def test_01_ui_no_restriction(self):
+        partner_admin = self.env.ref("base.partner_admin")
         self.env["ir.filters"].create(
             {
                 "name": "Test Assortment",
                 "model_id": "product.product",
                 "is_assortment": True,
                 "domain": [("id", "!=", self.product.product_variant_id.id)],
-                "partner_domain": "[('id', '=', %s)]"
-                % self.env.ref("base.partner_admin").id,
+                "partner_domain": f"[('id', '=', {partner_admin.id})]",
             }
         )
         self.start_tour("/shop", "test_assortment_with_no_restriction", login="admin")
 
     def test_02_ui_no_show(self):
+        partner_admin = self.env.ref("base.partner_admin")
         self.env["ir.filters"].create(
             {
                 "name": "Test Assortment",
                 "model_id": "product.product",
                 "is_assortment": True,
                 "domain": [("id", "!=", self.product.product_variant_id.id)],
-                "partner_domain": "[('id', '=', %s)]"
-                % self.env.ref("base.partner_admin").id,
+                "partner_domain": f"[('id', '=', {partner_admin.id})]",
                 "website_availability": "no_show",
             }
         )
         self.start_tour("/shop", "test_assortment_with_no_show", login="admin")
 
     def test_03_ui_no_purchase(self):
+        partner_admin = self.env.ref("base.partner_admin")
         self.env["ir.filters"].create(
             {
                 "name": "Test Assortment",
                 "model_id": "product.product",
                 "is_assortment": True,
                 "domain": [("id", "!=", self.product.product_variant_id.id)],
-                "partner_domain": "[('id', '=', %s)]"
-                % self.env.ref("base.partner_admin").id,
+                "partner_domain": f"[('id', '=', {partner_admin.id})]",
                 "website_availability": "no_purchase",
                 "message_unavailable": "Can't purchase",
                 "assortment_information": """<span name='testing'>
diff --git a/website_sale_product_assortment/views/ir_filters_views.xml b/website_sale_product_assortment/views/ir_filters_views.xml
index 10140fe35f..018522de31 100644
--- a/website_sale_product_assortment/views/ir_filters_views.xml
+++ b/website_sale_product_assortment/views/ir_filters_views.xml
@@ -18,11 +18,11 @@
                     <field name="website_availability" />
                     <field
                         name="message_unavailable"
-                        attrs="{'invisible': [('website_availability', '!=', 'no_purchase')]}"
+                        invisible="website_availability != 'no_purchase'"
                     />
                     <field
                         name="assortment_information"
-                        attrs="{'invisible': [('website_availability', '!=', 'no_purchase')]}"
+                        invisible="website_availability != 'no_purchase'"
                     />
                 </group>
             </xpath>