diff --git a/src/attributes/views/AttributeList/AttributeList.tsx b/src/attributes/views/AttributeList/AttributeList.tsx
index 6fc565255..c8b8241d1 100644
--- a/src/attributes/views/AttributeList/AttributeList.tsx
+++ b/src/attributes/views/AttributeList/AttributeList.tsx
@@ -8,8 +8,8 @@ import {
   deleteFilterTab,
   getActiveFilters,
   getFilterTabs,
-  saveFilterTab,
-  getFilterVariables
+  getFilterVariables,
+  saveFilterTab
 } from "@saleor/attributes/views/AttributeList/filters";
 import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog";
 import SaveFilterTabDialog, {
diff --git a/src/orders/components/OrderListPage/OrderListPage.tsx b/src/orders/components/OrderListPage/OrderListPage.tsx
index 80f21887f..67b7947d0 100644
--- a/src/orders/components/OrderListPage/OrderListPage.tsx
+++ b/src/orders/components/OrderListPage/OrderListPage.tsx
@@ -30,9 +30,9 @@ const OrderListPage: React.FC<OrderListPageProps> = ({
   onAll,
   onSearchChange,
   onFilterAdd,
-  onFilterSave,
   onTabChange,
-  onFilterDelete,
+  onTabDelete,
+  onTabSave,
   ...listProps
 }) => {
   const intl = useIntl();
@@ -58,7 +58,7 @@ const OrderListPage: React.FC<OrderListPageProps> = ({
           filterLabel={intl.formatMessage({
             defaultMessage: "Select all orders where:"
           })}
-          filterTabs={tabs}
+          tabs={tabs}
           filtersList={filtersList}
           initialSearch={initialSearch}
           searchPlaceholder={intl.formatMessage({
@@ -67,9 +67,9 @@ const OrderListPage: React.FC<OrderListPageProps> = ({
           onAll={onAll}
           onSearchChange={onSearchChange}
           onFilterAdd={onFilterAdd}
-          onFilterSave={onFilterSave}
           onTabChange={onTabChange}
-          onFilterDelete={onFilterDelete}
+          onTabDelete={onTabDelete}
+          onTabSave={onTabSave}
         />
         <OrderList {...listProps} />
       </Card>
diff --git a/src/orders/views/OrderList/OrderList.tsx b/src/orders/views/OrderList/OrderList.tsx
index 4768620b7..3bac2a380 100644
--- a/src/orders/views/OrderList/OrderList.tsx
+++ b/src/orders/views/OrderList/OrderList.tsx
@@ -232,11 +232,11 @@ export const OrderList: React.StatelessComponent<OrderListProps> = ({
                         onFilterAdd={data =>
                           changeFilterField(createFilter(params, data))
                         }
-                        onFilterSave={() => openModal("save-search")}
-                        onFilterDelete={() => openModal("delete-search")}
+                        onTabSave={() => openModal("save-search")}
+                        onTabDelete={() => openModal("delete-search")}
                         onTabChange={handleTabChange}
                         initialSearch={params.email || ""}
-                        filterTabs={getFilterTabs().map(tab => tab.name)}
+                        tabs={getFilterTabs().map(tab => tab.name)}
                         onAll={() =>
                           changeFilters({
                             status: undefined
diff --git a/src/products/components/ProductListPage/ProductListPage.tsx b/src/products/components/ProductListPage/ProductListPage.tsx
index 9d41d62cd..5a200eaf5 100644
--- a/src/products/components/ProductListPage/ProductListPage.tsx
+++ b/src/products/components/ProductListPage/ProductListPage.tsx
@@ -64,9 +64,9 @@ export const ProductListPage: React.FC<ProductListPageProps> = props => {
     onFetchMore,
     onSearchChange,
     onFilterAdd,
-    onFilterSave,
     onTabChange,
-    onFilterDelete,
+    onTabDelete,
+    onTabSave,
     onUpdateListSettings,
     ...listProps
   } = props;
@@ -140,13 +140,13 @@ export const ProductListPage: React.FC<ProductListPageProps> = props => {
           currentTab={currentTab}
           filtersList={filtersList}
           initialSearch={initialSearch}
-          tabs={tabs}
           onAll={onAll}
-          onSearchChange={onSearchChange}
           onFilterAdd={onFilterAdd}
-          onFilterSave={onFilterSave}
+          onSearchChange={onSearchChange}
           onTabChange={onTabChange}
-          onFilterDelete={onFilterDelete}
+          onTabDelete={onTabDelete}
+          onTabSave={onTabSave}
+          tabs={tabs}
         />
         <ProductList
           {...listProps}
diff --git a/src/products/views/ProductList/ProductList.tsx b/src/products/views/ProductList/ProductList.tsx
index 225cbfa3f..a15798fa7 100644
--- a/src/products/views/ProductList/ProductList.tsx
+++ b/src/products/views/ProductList/ProductList.tsx
@@ -351,8 +351,8 @@ export const ProductList: React.StatelessComponent<ProductListProps> = ({
                             onFilterAdd={filter =>
                               changeFilterField(createFilter(filter))
                             }
-                            onFilterSave={() => openModal("save-search")}
-                            onFilterDelete={() => openModal("delete-search")}
+                            onTabSave={() => openModal("save-search")}
+                            onTabDelete={() => openModal("delete-search")}
                             onTabChange={handleTabChange}
                             initialSearch={params.query || ""}
                             tabs={getFilterTabs().map(tab => tab.name)}