diff --git a/README.md b/README.md
index 0ddf493b..a4567f84 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Available addons
 addon | version | maintainers | summary
 --- | --- | --- | ---
 [spreadsheet_dashboard_oca](spreadsheet_dashboard_oca/) | 17.0.1.0.0 |  | Use OCA Spreadsheets on dashboards configuration
-[spreadsheet_oca](spreadsheet_oca/) | 17.0.1.0.0 |  | Allow to edit spreadsheets
+[spreadsheet_oca](spreadsheet_oca/) | 17.0.1.0.5 |  | Allow to edit spreadsheets
 
 [//]: # (end addons)
 
diff --git a/spreadsheet_oca/README.rst b/spreadsheet_oca/README.rst
index 23afef23..c7715ee6 100644
--- a/spreadsheet_oca/README.rst
+++ b/spreadsheet_oca/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ===============
 Spreadsheet Oca
 ===============
@@ -7,13 +11,13 @@ Spreadsheet Oca
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a7edc105b2730d126fc787ef8ef2c8c1d293b8e18e94402ff7db7d044ee863cd
+   !! source digest: sha256:8d07bc71c4c01a4b8ab7b5f582b56a7b0a01dd8ca273ca176e10078a68023269
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fspreadsheet-lightgray.png?logo=github
diff --git a/spreadsheet_oca/__manifest__.py b/spreadsheet_oca/__manifest__.py
index e2e3e751..aca95c29 100644
--- a/spreadsheet_oca/__manifest__.py
+++ b/spreadsheet_oca/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Spreadsheet Oca",
     "summary": """
         Allow to edit spreadsheets""",
-    "version": "17.0.1.0.0",
+    "version": "17.0.1.0.5",
     "license": "AGPL-3",
     "author": "CreuBlanca,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/spreadsheet",
diff --git a/spreadsheet_oca/controllers/main.py b/spreadsheet_oca/controllers/main.py
index ef77af1d..dcc35bc7 100644
--- a/spreadsheet_oca/controllers/main.py
+++ b/spreadsheet_oca/controllers/main.py
@@ -1,8 +1,6 @@
 # Copyright 2024 Tecnativa - Carlos Roca
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 import json
-from io import BytesIO
-from zipfile import ZipFile
 
 from odoo.http import Controller, content_disposition, request, route
 
@@ -13,13 +11,9 @@ def download_spreadsheet_xlsx(self, zip_name, files, **kw):
         if hasattr(files, "read"):
             files = files.read().decode("utf-8")
         files = json.loads(files)
-        file_bytes = BytesIO()
-        with ZipFile(file_bytes, "w") as zip_file:
-            for file in files:
-                zip_file.writestr(file["path"], file["content"])
-        file_content = file_bytes.getvalue()
+        file_content = request.env["spreadsheet.mixin"]._zip_xslx_files(files)
         return request.make_response(
-            file_bytes.getvalue(),
+            file_content,
             [
                 ("Content-Length", len(file_content)),
                 ("Content-Type", "application/vnd.ms-excel"),
diff --git a/spreadsheet_oca/i18n/spreadsheet_oca.pot b/spreadsheet_oca/i18n/spreadsheet_oca.pot
index a961e6cc..eec56fb7 100644
--- a/spreadsheet_oca/i18n/spreadsheet_oca.pot
+++ b/spreadsheet_oca/i18n/spreadsheet_oca.pot
@@ -513,6 +513,7 @@ msgstr ""
 #. module: spreadsheet_oca
 #. odoo-javascript
 #: code:addons/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_renderer.esm.js:0
+#: code:addons/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_renderer.esm.js:0
 #, python-format
 msgid "Odoo Spreadsheet"
 msgstr ""
diff --git a/spreadsheet_oca/static/description/index.html b/spreadsheet_oca/static/description/index.html
index 1d426e7d..8a56e5b9 100644
--- a/spreadsheet_oca/static/description/index.html
+++ b/spreadsheet_oca/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Spreadsheet Oca</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="spreadsheet-oca">
-<h1 class="title">Spreadsheet Oca</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="spreadsheet-oca">
+<h1>Spreadsheet Oca</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a7edc105b2730d126fc787ef8ef2c8c1d293b8e18e94402ff7db7d044ee863cd
+!! source digest: sha256:8d07bc71c4c01a4b8ab7b5f582b56a7b0a01dd8ca273ca176e10078a68023269
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/spreadsheet/tree/17.0/spreadsheet_oca"><img alt="OCA/spreadsheet" src="https://img.shields.io/badge/github-OCA%2Fspreadsheet-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/spreadsheet-17-0/spreadsheet-17-0-spreadsheet_oca"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/spreadsheet&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/spreadsheet/tree/17.0/spreadsheet_oca"><img alt="OCA/spreadsheet" src="https://img.shields.io/badge/github-OCA%2Fspreadsheet-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/spreadsheet-17-0/spreadsheet-17-0-spreadsheet_oca"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/spreadsheet&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds a functionality for adding and editing Spreadsheets
 using Odoo CE.</p>
 <p>It is an alternative to the proprietary module <tt class="docutils literal">spreadsheet_edition</tt>
@@ -397,9 +402,9 @@ <h1 class="title">Spreadsheet Oca</h1>
 </ul>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <div class="section" id="create-a-new-spreadsheet">
-<h2><a class="toc-backref" href="#toc-entry-2"><strong>Create a new spreadsheet</strong></a></h2>
+<h3><a class="toc-backref" href="#toc-entry-2"><strong>Create a new spreadsheet</strong></a></h3>
 <ul class="simple">
 <li>Go to ‘Spreadsheet’ menu</li>
 <li>Click on ‘Create’</li>
@@ -446,7 +451,7 @@ <h2><a class="toc-backref" href="#toc-entry-2"><strong>Create a new spreadsheet<
 </ul>
 </div>
 <div class="section" id="create-a-new-dynamic-spreadsheet-from-pivot">
-<h2><a class="toc-backref" href="#toc-entry-3"><strong>Create a new dynamic spreadsheet from pivot</strong></a></h2>
+<h3><a class="toc-backref" href="#toc-entry-3"><strong>Create a new dynamic spreadsheet from pivot</strong></a></h3>
 <ul class="simple">
 <li>Go to any pivot</li>
 <li>Press on insert button</li>
@@ -487,22 +492,22 @@ <h2><a class="toc-backref" href="#toc-entry-3"><strong>Create a new dynamic spre
 </div>
 </div>
 <div class="section" id="development">
-<h1><a class="toc-backref" href="#toc-entry-4">Development</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-4">Development</a></h2>
 <p>If you want to develop custom business functions, you can add others,
 based on the file
 <a class="reference external" href="https://github.com/odoo/odoo/blob/16.0/addons/spreadsheet_account/static/src/accounting_functions.js">https://github.com/odoo/odoo/blob/16.0/addons/spreadsheet_account/static/src/accounting_functions.js</a></p>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#toc-entry-5">Known issues / Roadmap</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-5">Known issues / Roadmap</a></h2>
 <div class="section" id="adding-new-lines-on-pivot-tables">
-<h2><a class="toc-backref" href="#toc-entry-6">Adding new lines on pivot tables</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Adding new lines on pivot tables</a></h3>
 <p>When we add a pivot table, the number of rows is predefined according to
 the current data.</p>
 <p>In order to add new rows, we need to reinsert the pivot table.</p>
 </div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-7">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-7">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/spreadsheet/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
@@ -510,15 +515,15 @@ <h1><a class="toc-backref" href="#toc-entry-7">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-8">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-8">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-9">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-9">Authors</a></h3>
 <ul class="simple">
 <li>CreuBlanca</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-10">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-10">Contributors</a></h3>
 <ul class="simple">
 <li>Enric Tobella</li>
 <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
@@ -532,7 +537,7 @@ <h2><a class="toc-backref" href="#toc-entry-10">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-11">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-11">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -545,5 +550,6 @@ <h2><a class="toc-backref" href="#toc-entry-11">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>
diff --git a/spreadsheet_oca/static/src/spreadsheet/bundle/filter.esm.js b/spreadsheet_oca/static/src/spreadsheet/bundle/filter.esm.js
index a6d1723b..99f9677d 100644
--- a/spreadsheet_oca/static/src/spreadsheet/bundle/filter.esm.js
+++ b/spreadsheet_oca/static/src/spreadsheet/bundle/filter.esm.js
@@ -181,6 +181,7 @@ export class EditFilterPanel extends Component {
   }
   onFieldMatchUpdate(object, name) {
     this.state.objects[object.id].fieldMatch.chain = name;
+    this.state.objects[object.id].fieldMatch.type = object.fields[name]?.type;
   }
   toggleDateDefaultValue(ev) {
     this.state.defaultValue = ev.target.checked ? "this_month" : undefined;
diff --git a/spreadsheet_oca/static/src/spreadsheet/bundle/filter_panel_datasources.esm.js b/spreadsheet_oca/static/src/spreadsheet/bundle/filter_panel_datasources.esm.js
index 2d9bd56c..5e764e1a 100644
--- a/spreadsheet_oca/static/src/spreadsheet/bundle/filter_panel_datasources.esm.js
+++ b/spreadsheet_oca/static/src/spreadsheet/bundle/filter_panel_datasources.esm.js
@@ -81,8 +81,7 @@ export class PivotPanelDisplay extends Component {
     const sortedColumn = this.props.pivotDefinition.sortedColumn;
     const orderTranslate =
       sortedColumn.order === "asc" ? _t("ascending") : _t("descending");
-    const GroupByDisplayLabel = this.PivotDataSource.getGroupByDisplayLabel(
-      "measure",
+    const GroupByDisplayLabel = this.PivotDataSource.getMeasureDisplayName(
       sortedColumn.measure
     );
     return `${GroupByDisplayLabel} (${orderTranslate})`;
diff --git a/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_action.esm.js b/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_action.esm.js
index b91f92d1..8e7a263c 100644
--- a/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_action.esm.js
+++ b/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_action.esm.js
@@ -147,9 +147,9 @@ export class ActionSpreadsheetOca extends Component {
       while (row >= 0) {
         for (var col = maxcols; col >= 0; col--) {
           if (
-            spreadsheet_model.getters.getCell(sheetId, col, row) !==
+            spreadsheet_model.getters.getCell({ sheetId, col, row }) !==
               undefined &&
-            !spreadsheet_model.getters.getCell(sheetId, col, row).isEmpty()
+            spreadsheet_model.getters.getCell({ sheetId, col, row }).content
           ) {
             filled = true;
             break;
diff --git a/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_renderer.esm.js b/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_renderer.esm.js
index bf586890..c8fc38ee 100644
--- a/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_renderer.esm.js
+++ b/spreadsheet_oca/static/src/spreadsheet/bundle/spreadsheet_renderer.esm.js
@@ -132,6 +132,7 @@ export class SpreadsheetRenderer extends Component {
       saveSpreadsheet: this.onSpreadsheetSaved.bind(this),
       askConfirmation: this.askConfirmation.bind(this),
       downloadAsXLXS: this.downloadAsXLXS.bind(this),
+      raiseError: this.raiseError.bind(this),
     });
     onWillStart(async () => {
       await loadSpreadsheetDependencies();
@@ -172,6 +173,13 @@ export class SpreadsheetRenderer extends Component {
     });
     this.ui.unblock();
   }
+  raiseError(body, callBack) {
+    this.dialog.add(
+      ConfirmationDialog,
+      { title: _t("Odoo Spreadsheet"), body },
+      { onClose: callBack }
+    );
+  }
 }
 
 SpreadsheetRenderer.template = "spreadsheet_oca.SpreadsheetRenderer";