diff --git a/src/orders/queries.ts b/src/orders/queries.ts
index 3888f7c5a..2eab79cd8 100644
--- a/src/orders/queries.ts
+++ b/src/orders/queries.ts
@@ -168,7 +168,6 @@ export const orderListQuery = gql`
     $after: String
     $last: Int
     $before: String
-    $status: OrderStatusFilter
     $filter: OrderFilterInput
   ) {
     orders(
@@ -176,7 +175,6 @@ export const orderListQuery = gql`
       after: $after
       first: $first
       last: $last
-      status: $status
       filter: $filter
     ) {
       edges {
diff --git a/src/orders/types/OrderList.ts b/src/orders/types/OrderList.ts
index 959ca2309..95c4e4a4f 100644
--- a/src/orders/types/OrderList.ts
+++ b/src/orders/types/OrderList.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { OrderStatusFilter, OrderFilterInput, PaymentChargeStatusEnum, OrderStatus } from "./../../types/globalTypes";
+import { OrderFilterInput, PaymentChargeStatusEnum, OrderStatus } from "./../../types/globalTypes";
 
 // ====================================================
 // GraphQL query operation: OrderList
@@ -81,6 +81,5 @@ export interface OrderListVariables {
   after?: string | null;
   last?: number | null;
   before?: string | null;
-  status?: OrderStatusFilter | null;
   filter?: OrderFilterInput | null;
 }
diff --git a/src/orders/urls.ts b/src/orders/urls.ts
index b3a5d46d6..ce0ce9a0e 100644
--- a/src/orders/urls.ts
+++ b/src/orders/urls.ts
@@ -19,7 +19,8 @@ export enum OrderListUrlFiltersEnum {
   dateFrom = "dateFrom",
   dateTo = "dateTo",
   email = "email",
-  payment = "payment"
+  payment = "payment",
+  query = "query"
 }
 export enum OrderListUrlFiltersWithMultipleValuesEnum {
   status = "status"
diff --git a/src/orders/views/OrderList/OrderList.tsx b/src/orders/views/OrderList/OrderList.tsx
index 3bac2a380..69e572e29 100644
--- a/src/orders/views/OrderList/OrderList.tsx
+++ b/src/orders/views/OrderList/OrderList.tsx
@@ -228,14 +228,14 @@ export const OrderList: React.StatelessComponent<OrderListProps> = ({
                             />
                           </Button>
                         }
-                        onSearchChange={email => changeFilterField({ email })}
+                        onSearchChange={query => changeFilterField({ query })}
                         onFilterAdd={data =>
                           changeFilterField(createFilter(params, data))
                         }
                         onTabSave={() => openModal("save-search")}
                         onTabDelete={() => openModal("delete-search")}
                         onTabChange={handleTabChange}
-                        initialSearch={params.email || ""}
+                        initialSearch={params.query || ""}
                         tabs={getFilterTabs().map(tab => tab.name)}
                         onAll={() =>
                           changeFilters({
diff --git a/src/orders/views/OrderList/__snapshots__/filters.test.ts.snap b/src/orders/views/OrderList/__snapshots__/filters.test.ts.snap
index 8c70c08ce..77dd07779 100644
--- a/src/orders/views/OrderList/__snapshots__/filters.test.ts.snap
+++ b/src/orders/views/OrderList/__snapshots__/filters.test.ts.snap
@@ -10,6 +10,10 @@ Array [
     "label": "Date to 2019-09-10",
     "onClick": [Function],
   },
+  Object {
+    "label": "email@example.com",
+    "onClick": [Function],
+  },
   Object {
     "label": "Fulfilled",
     "onClick": [Function],
@@ -88,6 +92,7 @@ Object {
     "lte": "2019-09-10",
   },
   "customer": "email@example.com",
+  "search": "24",
   "status": Array [
     "FULFILLED",
     "PARTIALLY_FULFILLED",
@@ -102,6 +107,7 @@ Object {
     "lte": "2019-09-10",
   },
   "customer": "email@example.com",
+  "search": "24",
   "status": Array [
     "FULFILLED",
   ],
diff --git a/src/orders/views/OrderList/filters.test.ts b/src/orders/views/OrderList/filters.test.ts
index 7864d9455..a8bb1f032 100644
--- a/src/orders/views/OrderList/filters.test.ts
+++ b/src/orders/views/OrderList/filters.test.ts
@@ -115,6 +115,7 @@ test("Crate filter chips", () => {
     {
       dateFrom: "2019-09-01",
       dateTo: "2019-09-10",
+      email: "email@example.com",
       status: [OrderStatus.FULFILLED, OrderStatus.PARTIALLY_FULFILLED]
     },
     {
@@ -133,6 +134,7 @@ describe("Get filter variables", () => {
       dateFrom: "2019-09-01",
       dateTo: "2019-09-10",
       email: "email@example.com",
+      query: "24",
       status: OrderStatus.FULFILLED.toString()
     });
 
@@ -144,6 +146,7 @@ describe("Get filter variables", () => {
       dateFrom: "2019-09-01",
       dateTo: "2019-09-10",
       email: "email@example.com",
+      query: "24",
       status: [
         OrderStatus.FULFILLED.toString(),
         OrderStatus.PARTIALLY_FULFILLED.toString()
diff --git a/src/orders/views/OrderList/filters.ts b/src/orders/views/OrderList/filters.ts
index 74645bf87..c9441161b 100644
--- a/src/orders/views/OrderList/filters.ts
+++ b/src/orders/views/OrderList/filters.ts
@@ -84,6 +84,7 @@ export function getFilterVariables(
       lte: params.dateTo
     },
     customer: params.email,
+    search: params.query,
     status: Array.isArray(params.status)
       ? params.status.map(status => findInEnum(status, OrderStatusFilter))
       : params.status
@@ -191,6 +192,20 @@ export function createFilterChips(
     }
   }
 
+  if (!!filters.email) {
+    filterChips = [
+      ...filterChips,
+      {
+        label: filters.email,
+        onClick: () =>
+          onFilterDelete({
+            ...filters,
+            email: undefined
+          })
+      }
+    ];
+  }
+
   if (!!filters.status) {
     const statusFilterChips = Array.isArray(filters.status)
       ? filters.status.map((status, statusIndex) => ({
diff --git a/src/productTypes/types/ProductTypeList.ts b/src/productTypes/types/ProductTypeList.ts
index 64fa7e917..6a83fa4de 100644
--- a/src/productTypes/types/ProductTypeList.ts
+++ b/src/productTypes/types/ProductTypeList.ts
@@ -2,6 +2,8 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
+import { ProductTypeFilterInput } from "./../../types/globalTypes";
+
 // ====================================================
 // GraphQL query operation: ProductTypeList
 // ====================================================
@@ -49,4 +51,5 @@ export interface ProductTypeListVariables {
   before?: string | null;
   first?: number | null;
   last?: number | null;
+  filter?: ProductTypeFilterInput | null;
 }