diff --git a/apps/builder/package.json b/apps/builder/package.json
index be14fca222..4aa0b9a4d8 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "author": "ILLA Cloud <opensource@illasoft.com>",
   "license": "Apache-2.0",
-  "version": "4.5.4",
+  "version": "4.5.5",
   "scripts": {
     "dev": "vite --strictPort --force",
     "build-cloud": "NODE_OPTIONS=--max-old-space-size=12288  vite build --mode cloud",
diff --git a/apps/builder/src/widgetLibrary/DataGridWidget/panelConfig.tsx b/apps/builder/src/widgetLibrary/DataGridWidget/panelConfig.tsx
index 53064d27f0..e42fe63766 100644
--- a/apps/builder/src/widgetLibrary/DataGridWidget/panelConfig.tsx
+++ b/apps/builder/src/widgetLibrary/DataGridWidget/panelConfig.tsx
@@ -852,7 +852,7 @@ export const DATA_GRID_PANEL_CONFIG: PanelConfig[] = [
         id: `${baseWidgetName}-basic-totalRowCount`,
         labelName: i18n.t("editor.inspect.setter_label.table.total_row_count"),
         attrName: "totalRowCount",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         isSetterSingleRow: true,
         expectedType: VALIDATION_TYPES.NUMBER,
         bindAttrName: ["enablePagination", "enableServerSidePagination"],
@@ -864,7 +864,7 @@ export const DATA_GRID_PANEL_CONFIG: PanelConfig[] = [
         labelName: i18n.t("editor.inspect.setter_label.pageSize"),
         placeholder: "{{30}}",
         attrName: "pageSize",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         bindAttrName: ["enablePagination"],
         shown: (enablePagination) => enablePagination,
         expectedType: VALIDATION_TYPES.NUMBER,
@@ -874,7 +874,7 @@ export const DATA_GRID_PANEL_CONFIG: PanelConfig[] = [
         labelName: i18n.t("editor.inspect.setter_label.page"),
         placeholder: "{{0}}",
         attrName: "page",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         bindAttrName: ["enablePagination"],
         shown: (enablePagination) => enablePagination,
         expectedType: VALIDATION_TYPES.NUMBER,
@@ -884,7 +884,7 @@ export const DATA_GRID_PANEL_CONFIG: PanelConfig[] = [
         labelName: i18n.t("editor.inspect.setter_label.page_size_options"),
         placeholder: "{{[5, 10, 25]}}",
         attrName: "pageSizeOptions",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         bindAttrName: ["enablePagination"],
         shown: (enablePagination) => enablePagination,
         isSetterSingleRow: true,
diff --git a/apps/builder/src/widgetLibrary/GridListWidget/panelConfig.tsx b/apps/builder/src/widgetLibrary/GridListWidget/panelConfig.tsx
index 3e3b2a1eaf..13a1e3184c 100644
--- a/apps/builder/src/widgetLibrary/GridListWidget/panelConfig.tsx
+++ b/apps/builder/src/widgetLibrary/GridListWidget/panelConfig.tsx
@@ -111,7 +111,7 @@ export const GRID_LIST_PANEL_CONFIG: PanelConfig[] = [
         id: `${baseWidgetName}-basic-totalRowCount`,
         labelName: i18n.t("editor.inspect.setter_label.table.total_row_count"),
         attrName: "totalRowCount",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         isSetterSingleRow: true,
         expectedType: VALIDATION_TYPES.NUMBER,
         bindAttrName: [
@@ -135,7 +135,7 @@ export const GRID_LIST_PANEL_CONFIG: PanelConfig[] = [
         id: `${baseWidgetName}-basic-previousCursor`,
         labelName: i18n.t("editor.inspect.setter_label.previous_cursor"),
         attrName: "previousCursor",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         expectedType: VALIDATION_TYPES.STRING,
         bindAttrName: [
           "enablePagination",
@@ -151,7 +151,7 @@ export const GRID_LIST_PANEL_CONFIG: PanelConfig[] = [
         id: `${baseWidgetName}-basic-nextCursor`,
         labelName: i18n.t("editor.inspect.setter_label.table.next_cursor"),
         attrName: "nextCursor",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         expectedType: VALIDATION_TYPES.STRING,
         bindAttrName: [
           "enablePagination",
@@ -167,7 +167,7 @@ export const GRID_LIST_PANEL_CONFIG: PanelConfig[] = [
         id: `${baseWidgetName}-basic-hasNextPage`,
         labelName: i18n.t("editor.inspect.setter_label.table.has_next_page"),
         attrName: "hasNextPage",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         expectedType: VALIDATION_TYPES.BOOLEAN,
         bindAttrName: [
           "enablePagination",
diff --git a/apps/builder/src/widgetLibrary/GridListWidget/widgetConfig.tsx b/apps/builder/src/widgetLibrary/GridListWidget/widgetConfig.tsx
index c9cc33b0bb..b5023dbdcc 100644
--- a/apps/builder/src/widgetLibrary/GridListWidget/widgetConfig.tsx
+++ b/apps/builder/src/widgetLibrary/GridListWidget/widgetConfig.tsx
@@ -69,7 +69,7 @@ export const GRID_LIST_WIDGET_CONFIG: WidgetConfig = {
     resizeDirection: RESIZE_DIRECTION.ALL,
     numberOfColumns: "{{3}}",
     minColumnWidth: "{{240}}",
-    page: 0,
+    page: "{{0}}",
     offset: 0,
     itemBorderRadius: "4px",
     itemShadow: "medium",
diff --git a/apps/builder/src/widgetLibrary/ListWidget/panelConfig.tsx b/apps/builder/src/widgetLibrary/ListWidget/panelConfig.tsx
index 32ddb9ec4e..ff8fe0ed05 100644
--- a/apps/builder/src/widgetLibrary/ListWidget/panelConfig.tsx
+++ b/apps/builder/src/widgetLibrary/ListWidget/panelConfig.tsx
@@ -107,7 +107,7 @@ export const LIST_PANEL_CONFIG: PanelConfig[] = [
         id: `${baseWidgetName}-basic-totalRowCount`,
         labelName: i18n.t("editor.inspect.setter_label.table.total_row_count"),
         attrName: "totalRowCount",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         isSetterSingleRow: true,
         expectedType: VALIDATION_TYPES.NUMBER,
         bindAttrName: [
@@ -131,7 +131,7 @@ export const LIST_PANEL_CONFIG: PanelConfig[] = [
         id: `${baseWidgetName}-basic-previousCursor`,
         labelName: i18n.t("editor.inspect.setter_label.previous_cursor"),
         attrName: "previousCursor",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         expectedType: VALIDATION_TYPES.STRING,
         bindAttrName: [
           "enablePagination",
@@ -147,7 +147,7 @@ export const LIST_PANEL_CONFIG: PanelConfig[] = [
         id: `${baseWidgetName}-basic-nextCursor`,
         labelName: i18n.t("editor.inspect.setter_label.table.next_cursor"),
         attrName: "nextCursor",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         expectedType: VALIDATION_TYPES.STRING,
         bindAttrName: [
           "enablePagination",
@@ -163,7 +163,7 @@ export const LIST_PANEL_CONFIG: PanelConfig[] = [
         id: `${baseWidgetName}-basic-hasNextPage`,
         labelName: i18n.t("editor.inspect.setter_label.table.has_next_page"),
         attrName: "hasNextPage",
-        setterType: "DATA_GRID_MAPPED_INPUT_SETTER",
+        setterType: "INPUT_SETTER",
         expectedType: VALIDATION_TYPES.BOOLEAN,
         bindAttrName: [
           "enablePagination",
diff --git a/apps/builder/src/widgetLibrary/ListWidget/widgetConfig.tsx b/apps/builder/src/widgetLibrary/ListWidget/widgetConfig.tsx
index 2cb2946dc3..06da1b82bc 100644
--- a/apps/builder/src/widgetLibrary/ListWidget/widgetConfig.tsx
+++ b/apps/builder/src/widgetLibrary/ListWidget/widgetConfig.tsx
@@ -68,7 +68,7 @@ export const LIST_WIDGET_CONFIG: WidgetConfig = {
     }}`,
     dynamicHeight: "fixed",
     resizeDirection: RESIZE_DIRECTION.ALL,
-    page: 0,
+    page: "{{0}}",
     offset: 0,
     itemBorderRadius: "4px",
     itemPadding: {