diff --git a/client/agency/src/zone/search-panel/index.html b/client/agency/src/zone/search-panel/index.html
index c5193a385..d3f06d8b3 100644
--- a/client/agency/src/zone/search-panel/index.html
+++ b/client/agency/src/zone/search-panel/index.html
@@ -3,11 +3,18 @@
         <vn-horizontal>
             <vn-textfield
                 vn-one
-                label="Name"
-                model="filter.name"
+                label="General search"
+                model="filter.search"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Name"
+                model="filter.name">
+            </vn-textfield>
+        </vn-horizontal>
         <vn-horizontal>
             <vn-autocomplete
                 vn-one
diff --git a/client/claim/src/search-panel/index.html b/client/claim/src/search-panel/index.html
index 700f213de..f38e2d332 100644
--- a/client/claim/src/search-panel/index.html
+++ b/client/claim/src/search-panel/index.html
@@ -3,11 +3,18 @@
         <vn-horizontal>
             <vn-textfield
                 vn-one
-                label="Client"
-                model="filter.client"
+                label="General search"
+                model="filter.search"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Client"
+                model="filter.client">
+            </vn-textfield>
+        </vn-horizontal>
         <vn-horizontal>
             <vn-textfield
                 vn-one
diff --git a/client/client/src/search-panel/index.html b/client/client/src/search-panel/index.html
index de772afe3..14619ed94 100644
--- a/client/client/src/search-panel/index.html
+++ b/client/client/src/search-panel/index.html
@@ -1,22 +1,61 @@
 <div pad-large style="min-width: 30em">
     <form ng-submit="$ctrl.onSearch()">
         <vn-horizontal>
-            <vn-textfield vn-one label="Client id" model="filter.id" vn-focus></vn-textfield>
-            <vn-textfield vn-one label="Tax number" model="filter.fi"></vn-textfield>
+            <vn-textfield
+                vn-one
+                label="General search"
+                model="filter.search"
+                vn-focus>
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-textfield vn-one label="Name" model="filter.name"></vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Client id"
+                model="filter.id">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Tax number"
+                model="filter.fi">
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-textfield vn-one label="Social name" model="filter.socialName"></vn-textfield>
+            <vn-textfield
+                vn-one label="Name"
+                model="filter.name">
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-textfield vn-one label="Town/City" model="filter.city"></vn-textfield>
-            <vn-textfield vn-one label="Postcode" model="filter.postcode"></vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Social name"
+                model="filter.socialName">
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-textfield vn-one label="Email" model="filter.email"></vn-textfield>
-            <vn-textfield vn-one label="Phone" model="filter.phone"></vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Town/City"
+                model="filter.city">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Postcode"
+                model="filter.postcode">
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Email"
+                model="filter.email">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Phone"
+                model="filter.phone">
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal margin-large-top>
             <vn-submit label="Search"></vn-submit>
diff --git a/client/core/src/components/searchbar/searchbar.js b/client/core/src/components/searchbar/searchbar.js
index 40a023d5a..13c86e8c8 100644
--- a/client/core/src/components/searchbar/searchbar.js
+++ b/client/core/src/components/searchbar/searchbar.js
@@ -159,14 +159,13 @@ export default class Controller extends Component {
             let regex = /((([\w_]+):([\w_]+))|([\w_]+):\(([\w_ ]+)\))/gi;
             let findPattern = searchString.match(regex);
             let remnantString = searchString.replace(regex, '').trim();
-            if (findPattern) {
+            if (findPattern)
                 for (let i = 0; i < findPattern.length; i++) {
                     let aux = findPattern[i].split(':');
                     let property = aux[0];
                     let value = aux[1].replace(/\(|\)/g, '');
                     result[property] = value.trim();
                 }
-            }
             if (remnantString)
                 result.search = remnantString;
         }
diff --git a/client/core/src/locale/en.yml b/client/core/src/locale/en.yml
index 613eda985..99a9b8049 100644
--- a/client/core/src/locale/en.yml
+++ b/client/core/src/locale/en.yml
@@ -12,4 +12,5 @@ Next: Next
 Finalize: Finalize
 Previous: Back
 Load more: Load more
-Auto-scroll interrupted, please adjust the search: Auto-scroll interrupted, please adjust the search
\ No newline at end of file
+Auto-scroll interrupted, please adjust the search: Auto-scroll interrupted, please adjust the search
+General search: General search
\ No newline at end of file
diff --git a/client/core/src/locale/es.yml b/client/core/src/locale/es.yml
index 6c84cd925..0771b1181 100644
--- a/client/core/src/locale/es.yml
+++ b/client/core/src/locale/es.yml
@@ -23,4 +23,5 @@ Value can't be null: El valor no puede ser nulo
 Value should be %s characters long: El valor debe ser de %s carácteres de longitud
 Value should have a length between %s and %s: El valor debe tener una longitud de entre %s y %s
 Value should have at least %s characters: El valor debe tener al menos %s carácteres
-Value should have at most %s characters: El valor debe tener un máximo de %s carácteres
\ No newline at end of file
+Value should have at most %s characters: El valor debe tener un máximo de %s carácteres
+General search: Busqueda general
\ No newline at end of file
diff --git a/client/item/src/search-panel/index.html b/client/item/src/search-panel/index.html
index e14444805..66bdefa44 100644
--- a/client/item/src/search-panel/index.html
+++ b/client/item/src/search-panel/index.html
@@ -4,10 +4,17 @@
         <vn-horizontal>
             <vn-textfield
                 vn-one
-                label="Id"
-                model="filter.id"
+                label="General search"
+                model="filter.search"
                 vn-focus>
             </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Id"
+                model="filter.id">
+            </vn-textfield>
             <vn-textfield
                 vn-one
                 label="Name"
diff --git a/client/order/src/search-panel/index.html b/client/order/src/search-panel/index.html
index dc9c4d9a6..13827fcee 100644
--- a/client/order/src/search-panel/index.html
+++ b/client/order/src/search-panel/index.html
@@ -1,5 +1,13 @@
 <div pad-large style="min-width: 30em">
     <form ng-submit="$ctrl.onSearch()">
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="General search"
+                model="filter.search"
+                vn-focus>
+            </vn-textfield>
+        </vn-horizontal>
         <vn-horizontal>
             <vn-textfield
                 vn-one
diff --git a/client/ticket/src/search-panel/index.html b/client/ticket/src/search-panel/index.html
index b53e3e739..29cc3eef9 100644
--- a/client/ticket/src/search-panel/index.html
+++ b/client/ticket/src/search-panel/index.html
@@ -3,11 +3,18 @@
         <vn-horizontal>
             <vn-textfield
                 vn-one
-                label="Nickname"
-                model="filter.nickname"
+                label="General search"
+                model="filter.search"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Nickname"
+                model="filter.nickname">
+            </vn-textfield>
+        </vn-horizontal>
         <vn-horizontal>
             <vn-textfield
                 vn-one