diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js
index f8099caf1..b9c761874 100644
--- a/front/core/components/searchbar/searchbar.js
+++ b/front/core/components/searchbar/searchbar.js
@@ -21,17 +21,23 @@ export default class Searchbar extends Component {
     constructor($element, $) {
         super($element, $);
         this.searchState = '.';
+        this.autoState = true;
 
-        let criteria = {};
         this.deregisterCallback = this.$transitions.onSuccess(
-            criteria, () => this.onStateChange());
+            {}, transition => this.onStateChange(transition));
     }
 
     $postLink() {
-        this.onStateChange();
+        if (this.autoState) {
+            if (!this.baseState) {
+                let stateParts = this.$state.current.name.split('.');
+                this.baseState = stateParts[0];
+            }
 
-        if (this.$state.is(this.searchState) && this.filter !== null)
-            this.doSearch();
+            this.searchState = `${this.baseState}.index`;
+        }
+
+        this.fetchStateFilter(this.autoLoad);
     }
 
     $onDestroy() {
@@ -62,11 +68,18 @@ export default class Searchbar extends Component {
         if (value == null) this.params = [];
     }
 
-    onStateChange() {
-        let filter = null;
-        let isIndex = this.$state.is(this.searchState);
+    onStateChange(transition) {
+        if (!this.element.parentNode
+        || transition == this.transition)
+            return;
+
+        this.fetchStateFilter();
+    }
+
+    fetchStateFilter(autoLoad) {
+        if (this.$state.is(this.searchState)) {
+            let filter = null;
 
-        if (isIndex) {
             if (this.$params.q) {
                 try {
                     filter = JSON.parse(this.$params.q);
@@ -75,15 +88,12 @@ export default class Searchbar extends Component {
                 }
             }
 
-            focus(this.element.querySelector('vn-textfield input'));
-        }
+            if (!filter && autoLoad)
+                filter = {};
 
-        this.filter = filter;
-
-        if (isIndex)
-            this.doSearch();
-        else if (this.model)
-            this.model.clear();
+            this.doSearch(filter, 'state');
+        } else
+            this.clearSearch();
     }
 
     openPanel(event) {
@@ -112,21 +122,16 @@ export default class Searchbar extends Component {
         this.$.popover.hide();
         filter = compact(filter);
         filter = filter != null ? filter : {};
-        this.goSearch(filter);
+        this.doSearch(filter, 'panel');
     }
 
     onSubmit() {
-        this.goSearch(this.fromBar());
+        this.doSearch(this.fromBar(), 'bar');
     }
 
     removeParam(index) {
         this.params.splice(index, 1);
-        this.goSearch(this.fromBar());
-    }
-
-    goSearch(filter) {
-        this.filter = filter;
-        this.doSearch();
+        this.doSearch(this.fromBar(), 'bar');
     }
 
     fromBar() {
@@ -180,75 +185,94 @@ export default class Searchbar extends Component {
         });
     }
 
-    doSearch() {
-        let filter = this.filter;
-        if (filter == null && this.autoload)
-            filter = {};
-
-        if (this.onSearch)
-            this.onSearch({$params: filter});
-
-        if (this.model) {
-            if (filter !== null) {
-                let where = buildFilter(filter,
-                    (param, value) => this.exprBuilder({param, value}));
-
-                let userParams = {};
-                let hasParams = false;
-
-                if (this.paramBuilder) {
-                    for (let param in filter) {
-                        let value = filter[param];
-                        if (value == null) continue;
-                        let expr = this.paramBuilder({param, value});
-                        if (expr) {
-                            Object.assign(userParams, expr);
-                            hasParams = true;
-                        }
-                    }
-                }
-                this.model.applyFilter(
-                    where ? {where} : null,
-                    hasParams ? userParams : null
-                ).then(() => this.onModelFilter());
-            } else
-                this.model.clear();
-        }
+    clearSearch() {
+        if (!this.filter) return;
+        if (this.model) this.model.clear();
+        this.filter = null;
     }
 
-    onModelFilter() {
+    doSearch(filter, source) {
+        let promise;
+
+        if (this.model)
+            promise = this.modelSearch(filter);
+        else if (this.onSearch)
+            promise = this.onSearch({$params: filter});
+
+        promise = promise || this.$q.resolve();
+        promise.then(data => this.onFilter(filter, source, data));
+    }
+
+    modelSearch(filter) {
+        if (filter === null) {
+            this.model.clear();
+            return this.$q.resolve();
+        }
+
+        let where = null;
+        let params = null;
+
+        if (this.exprBuilder) {
+            where = buildFilter(filter,
+                (param, value) => this.exprBuilder({param, value}));
+        } else {
+            params = Object.assign({}, filter);
+
+            if (this.fetchParams)
+                params = this.fetchParams({$params: params});
+        }
+
+        return this.model.applyFilter(where ? {where} : null, params)
+            .then(() => this.model.data);
+    }
+
+    onFilter(filter, source, data) {
+        let state;
         let params;
         let opts;
-        let data = this.model.data;
-        let currentState = this.$state.current.name;
-        let stateParts = currentState.split('.');
-        let baseState = stateParts[0];
-        let subState = stateParts[1];
 
-        if (this.goState && data && data.length == 1) {
+        if (data && data.length == 1 && this.autoState && source != 'state') {
+            let baseDepth = this.baseState.split('.').length;
+            let stateParts = this.$state.current.name
+                .split('.')
+                .slice(baseDepth);
+
+            let subState = stateParts[0];
+
             switch (subState) {
-            case 'index':
-                subState = 'card.summary';
-                break;
             case 'card':
-                subState += `.${stateParts[2]}`;
+                subState += `.${stateParts[1]}`;
+                if (stateParts.length >= 3)
+                    subState += '.index';
                 break;
+            default:
+                subState = 'card.summary';
             }
 
-            if (this.goStateParams)
-                params = this.goStateParams({$row: data[0]});
+            if (this.singleParams)
+                params = this.singleParams({$row: data[0]});
+
+            state = `${this.baseState}.${subState}`;
+            filter = null;
         } else {
-            if (subState == 'index')
+            state = this.searchState;
+
+            if (filter)
+                params = {q: JSON.stringify(filter)};
+            if (this.$state.is(state))
                 opts = {location: 'replace'};
-            subState = `index`;
-            params = {q: JSON.stringify(this.filter)};
         }
 
-        this.$state.go(`${baseState}.${subState}`, params, opts);
+        this.filter = filter;
+
+        if (source != 'state')
+            this.transition = this.$state.go(state, params, opts).transition;
+        if (source != 'bar')
+            focus(this.element.querySelector('vn-textfield input'));
     }
 
-    exprBuilder(param, value) {
-        return {[param]: value};
+    singleParams(params) {
+        return {id: params.$row.id};
     }
 }
 
@@ -256,27 +280,29 @@ ngModule.vnComponent('vnSearchbar', {
     controller: Searchbar,
     template: require('./searchbar.html'),
     bindings: {
-        searchState: '@?',
         filter: '<?',
         suggestedFilter: '<?',
         panel: '@',
         info: '@?',
-        model: '<?',
         onSearch: '&?',
+        model: '<?',
         exprBuilder: '&?',
-        paramBuilder: '&?',
-        goState: '@?',
-        goStateParams: '&?'
+        baseState: '@?',
+        autoState: '<?',
+        singleParams: '&?',
+        fetchParams: '&?'
     }
 });
 
 class AutoSearch {
     constructor(vnSlotService) {
-        let searchbar = vnSlotService.getContent('topbar');
-        if (searchbar && searchbar.$ctrl instanceof Searchbar) {
+        this.vnSlotService = vnSlotService;
+    }
+
+    $postLink() {
+        let searchbar = this.vnSlotService.getContent('topbar');
+        if (searchbar && searchbar.$ctrl instanceof Searchbar)
             this.model = searchbar.$ctrl.model;
-            console.log(this.model.data);
-        }
     }
 }
 AutoSearch.$inject = ['vnSlotService'];
diff --git a/front/salix/module.js b/front/salix/module.js
index 7324ee922..34e53b8bd 100644
--- a/front/salix/module.js
+++ b/front/salix/module.js
@@ -67,7 +67,7 @@ export function config($translatePartialLoaderProvider, $httpProvider, $compileP
         .cssClassDirectivesEnabled(false);
 
     let env = process.env.NODE_ENV;
-    if (!env || env == 'development')
+    if (env && env !== 'development')
         $compileProvider.debugInfoEnabled(false);
 }
 ngModule.config(config);
diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html
index 383e55a9d..0f74e4a6c 100644
--- a/modules/claim/front/index/index.html
+++ b/modules/claim/front/index/index.html
@@ -1,13 +1,5 @@
-<vn-crud-model
-    vn-id="model"
-    url="Claims/filter"
-    limit="20"
-    data="claims"
-    order="claimStateFk ASC, created DESC"
-    auto-load="true">
-</vn-crud-model>
 <vn-auto-search
-    on-search="$ctrl.onSearch($params)">
+    model="model">
 </vn-auto-search>
 <vn-data-viewer
     model="model"
@@ -26,7 +18,7 @@
         </vn-thead>
         <vn-tbody>
             <a
-                ng-repeat="claim in claims"
+                ng-repeat="claim in model.data"
                 class="{{::$ctrl.compareDate(ticket.shipped)}} clickable vn-tr search-result"
                 ui-sref="claim.card.summary({id: claim.id})">
                 <vn-td number>{{::claim.id}}</vn-td>
diff --git a/modules/claim/front/index/index.js b/modules/claim/front/index/index.js
index 21464fea9..1e9724987 100644
--- a/modules/claim/front/index/index.js
+++ b/modules/claim/front/index/index.js
@@ -43,13 +43,6 @@ export default class Controller {
     onDescriptorLoad() {
         this.$.popover.relocate();
     }
-
-    onSearch(params) {
-        if (params)
-            this.$.model.applyFilter(null, params);
-        else
-            this.$.model.clear();
-    }
 }
 
 Controller.$inject = ['$scope'];
diff --git a/modules/claim/front/main/index.html b/modules/claim/front/main/index.html
index e733162b1..c66c02f14 100644
--- a/modules/claim/front/main/index.html
+++ b/modules/claim/front/main/index.html
@@ -1,8 +1,15 @@
+<vn-crud-model
+    vn-id="model"
+    url="Claims/filter"
+    limit="20"
+    order="claimStateFk ASC, created DESC"
+    auto-load="true">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="claim.index"
         panel="vn-claim-search-panel"
-        info="Search claim by id or client name">
+        info="Search claim by id or client name"
+        model="model">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/client/front/index/index.html b/modules/client/front/index/index.html
index f3c3fb728..a501b68cf 100644
--- a/modules/client/front/index/index.html
+++ b/modules/client/front/index/index.html
@@ -1,13 +1,6 @@
-<vn-crud-model
-    vn-id="model"
-    url="Clients"
-    order="id DESC"
-    limit="8"
-    data="clients">
-</vn-crud-model>
+
 <vn-auto-search
-    model="model"
-    expr-builder="$ctrl.exprBuilder(param, value)">
+    model="model">
 </vn-auto-search>
 <vn-data-viewer
     model="model"
@@ -15,7 +8,7 @@
     <vn-card>
     <div class="vn-list separated">
     <a
-        ng-repeat="client in clients track by client.id"
+        ng-repeat="client in model.data track by client.id"
         ui-sref="client.card.summary(::{id: client.id})"
         translate-attr="{title: 'View client'}"
         class="vn-item search-result">
diff --git a/modules/client/front/index/index.js b/modules/client/front/index/index.js
index 51dd41dea..054944f9d 100644
--- a/modules/client/front/index/index.js
+++ b/modules/client/front/index/index.js
@@ -7,33 +7,6 @@ export default class Controller {
         this.clientSelected = null;
     }
 
-    exprBuilder(param, value) {
-        switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? {id: value}
-                : {name: {like: `%${value}%`}};
-        case 'phone':
-            return {
-                or: [
-                    {phone: value},
-                    {mobile: value}
-                ]
-            };
-        case 'name':
-        case 'socialName':
-        case 'city':
-            return {[param]: {like: `%${value}%`}};
-        case 'email':
-            return {[param]: {like: `%${value}%`}};
-        case 'id':
-        case 'fi':
-        case 'postcode':
-        case 'salesPersonFk':
-            return {[param]: value};
-        }
-    }
-
     openSummary(client, event) {
         if (event.defaultPrevented) return;
         event.preventDefault();
diff --git a/modules/client/front/main/index.html b/modules/client/front/main/index.html
index 1ae1d211b..cab796c1f 100644
--- a/modules/client/front/main/index.html
+++ b/modules/client/front/main/index.html
@@ -1,8 +1,16 @@
+<vn-crud-model
+    vn-id="model"
+    url="Clients"
+    order="id DESC"
+    limit="8"
+    data="clients">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="client.index"
         panel="vn-client-search-panel"
-        info="Search client by id or name">
+        info="Search client by id or name"
+        model="model"
+        expr-builder="$ctrl.exprBuilder(param, value)">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/client/front/main/index.js b/modules/client/front/main/index.js
index 890165a19..cae95c1dd 100644
--- a/modules/client/front/main/index.js
+++ b/modules/client/front/main/index.js
@@ -1,7 +1,33 @@
 import ngModule from '../module';
 import ModuleMain from 'salix/components/module-main';
 
-export default class Client extends ModuleMain {}
+export default class Client extends ModuleMain {
+    exprBuilder(param, value) {
+        switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? {id: value}
+                : {name: {like: `%${value}%`}};
+        case 'phone':
+            return {
+                or: [
+                    {phone: value},
+                    {mobile: value}
+                ]
+            };
+        case 'name':
+        case 'socialName':
+        case 'city':
+        case 'email':
+            return {[param]: {like: `%${value}%`}};
+        case 'id':
+        case 'fi':
+        case 'postcode':
+        case 'salesPersonFk':
+            return {[param]: value};
+        }
+    }
+}
 
 ngModule.vnComponent('vnClient', {
     controller: Client,
diff --git a/modules/entry/front/index/index.html b/modules/entry/front/index/index.html
index 60bbe46d5..9dfaa7e34 100644
--- a/modules/entry/front/index/index.html
+++ b/modules/entry/front/index/index.html
@@ -1,13 +1,5 @@
-<vn-crud-model
-    vn-id="model"
-    url="Entries/filter"
-    limit="20"
-    params="::$ctrl.params"
-    data="entries"
-    auto-load="true">
-</vn-crud-model>
 <vn-auto-search
-    on-search="$ctrl.onSearch($params)">
+    model="model">
 </vn-auto-search>
 <vn-data-viewer
     model="model"
@@ -30,7 +22,7 @@
             </vn-tr>
         </vn-thead>
         <vn-tbody>
-            <a ng-repeat="entry in entries" 
+            <a ng-repeat="entry in model.data" 
                 class="clickable vn-tr search-result"
                 ui-sref="entry.card.summary({id: {{::entry.id}}})">
                 <vn-td shrink>
diff --git a/modules/entry/front/index/index.js b/modules/entry/front/index/index.js
index 53d2f45e0..7368cc05e 100644
--- a/modules/entry/front/index/index.js
+++ b/modules/entry/front/index/index.js
@@ -5,13 +5,6 @@ export default class Controller {
         this.$ = $scope;
     }
 
-    onSearch(params) {
-        if (params)
-            this.$.model.applyFilter(null, params);
-        else
-            this.$.model.clear();
-    }
-
     showTravelDescriptor(event, travelFk) {
         if (event.defaultPrevented) return;
         event.preventDefault();
diff --git a/modules/entry/front/main/index.html b/modules/entry/front/main/index.html
index 44b1b2b4e..07009b7b0 100644
--- a/modules/entry/front/main/index.html
+++ b/modules/entry/front/main/index.html
@@ -1,8 +1,14 @@
+<vn-crud-model
+    vn-id="model"
+    url="Entries/filter"
+    limit="20"
+    auto-load="true">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="entry.index"
         panel="vn-entry-search-panel"
-        info="Search entrys by id">
+        info="Search entrys by id"
+        model="model">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/invoiceOut/front/index/index.html b/modules/invoiceOut/front/index/index.html
index c798b8bc6..ad7c363ce 100644
--- a/modules/invoiceOut/front/index/index.html
+++ b/modules/invoiceOut/front/index/index.html
@@ -1,16 +1,9 @@
-<vn-crud-model
-    vn-id="model"
-    url="InvoiceOuts/filter"
-    limit="20"
-    data="invoiceOuts"
-    order="issued DESC">
-</vn-crud-model>
 <vn-auto-search
-    on-search="$ctrl.onSearch($params)">
+    model="model">
 </vn-auto-search>
 <vn-data-viewer
     model="model"
-    class="vn-w-md vn-my-md">
+    class="vn-w-md">
     <vn-card>
     <vn-table model="model">
         <vn-thead>
@@ -27,7 +20,7 @@
             </vn-tr>
         </vn-thead>
         <vn-tbody>
-            <a ng-repeat="invoiceOut in invoiceOuts"
+            <a ng-repeat="invoiceOut in model.data"
                 class="clickable vn-tr search-result"
                 ui-sref="invoiceOut.card.summary({id: {{::invoiceOut.id}}})">
                 <vn-td>{{::invoiceOut.ref | dashIfEmpty}}</vn-td>
diff --git a/modules/invoiceOut/front/index/index.js b/modules/invoiceOut/front/index/index.js
index dd8219fae..46ad6bc3f 100644
--- a/modules/invoiceOut/front/index/index.js
+++ b/modules/invoiceOut/front/index/index.js
@@ -32,13 +32,6 @@ export default class Controller {
         event.preventDefault();
         event.stopImmediatePropagation();
     }
-
-    onSearch(params) {
-        if (params)
-            this.$.model.applyFilter(null, params);
-        else
-            this.$.model.clear();
-    }
 }
 
 Controller.$inject = ['$scope', 'vnToken'];
diff --git a/modules/invoiceOut/front/main/index.html b/modules/invoiceOut/front/main/index.html
index 18e72ed5e..df65fd217 100644
--- a/modules/invoiceOut/front/main/index.html
+++ b/modules/invoiceOut/front/main/index.html
@@ -1,8 +1,14 @@
+<vn-crud-model
+    vn-id="model"
+    url="InvoiceOuts/filter"
+    limit="20"
+    order="issued DESC">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="invoiceOut.index"
         panel="vn-invoice-search-panel"
-        info="Search invoices by reference">
+        info="Search invoices by reference"
+        model="model">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html
index c83ce5ed1..154c64bb1 100644
--- a/modules/item/front/index/index.html
+++ b/modules/item/front/index/index.html
@@ -1,12 +1,5 @@
-<vn-crud-model
-    vn-id="model"
-    url="Items/filter"
-    limit="12"
-    order="isActive DESC, name, id"
-    data="items">
-</vn-crud-model>
 <vn-auto-search
-    on-search="$ctrl.onSearch($params)">
+    model="model">
 </vn-auto-search>
 <vn-data-viewer
     model="model"
@@ -37,7 +30,7 @@
             </vn-tr>
         </vn-thead>
         <vn-tbody>
-            <a ng-repeat="item in items"
+            <a ng-repeat="item in model.data"
                 class="clickable vn-tr search-result"
                 ui-sref="item.card.summary({id: item.id})">
                 <vn-td shrink>
diff --git a/modules/item/front/index/index.js b/modules/item/front/index/index.js
index 087021577..968c7b027 100644
--- a/modules/item/front/index/index.js
+++ b/modules/item/front/index/index.js
@@ -21,13 +21,6 @@ class Controller {
         event.stopImmediatePropagation();
     }
 
-    onSearch(params) {
-        if (params)
-            this.$.model.applyFilter(null, params);
-        else
-            this.$.model.clear();
-    }
-
     showItemDescriptor(event, itemFk) {
         if (event.defaultPrevented) return;
 
@@ -39,7 +32,6 @@ class Controller {
         this.$.itemDescriptor.show();
     }
 
-
     showWorkerDescriptor(event, workerFk) {
         if (event.defaultPrevented) return;
 
diff --git a/modules/item/front/main/index.html b/modules/item/front/main/index.html
index 758bfd55e..55ef00b75 100644
--- a/modules/item/front/main/index.html
+++ b/modules/item/front/main/index.html
@@ -1,9 +1,16 @@
+<vn-crud-model
+    vn-id="model"
+    url="Items/filter"
+    limit="12"
+    order="isActive DESC, name, id"
+    data="items">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="item.index"
         panel="vn-item-search-panel"
         info="Search items by id, name or barcode"
-        suggested-filter="{isActive: true}">
+        suggested-filter="{isActive: true}"
+        model="model">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index 20dd4a231..b16a1b25d 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -1,12 +1,6 @@
-<vn-crud-model
-    vn-id="model"
-    url="Orders/filter"
-    limit="20"
-    data="orders"
-    order="landed DESC, clientFk">
-</vn-crud-model>
+
 <vn-auto-search
-    on-search="$ctrl.onSearch($params)">
+    model="model">
 </vn-auto-search>
 <vn-data-viewer
     model="model"
@@ -27,8 +21,10 @@
             </vn-tr>
         </vn-thead>
         <vn-tbody>
-            <vn-tr ng-repeat="order in orders" class="clickable search-result"
-            ui-sref="order.card.summary({id: {{::order.id}}})">
+            <vn-tr
+                ng-repeat="order in model.data"
+                class="clickable search-result"
+                ui-sref="order.card.summary({id: {{::order.id}}})">
                 <vn-td number>{{::order.id}}</vn-td>
                 <vn-td expand>
                     <span class="link" ng-click="$ctrl.showClientDescriptor($event, order.clientFk)">
diff --git a/modules/order/front/index/index.js b/modules/order/front/index/index.js
index 8cf289796..10940eb27 100644
--- a/modules/order/front/index/index.js
+++ b/modules/order/front/index/index.js
@@ -8,13 +8,6 @@ export default class Controller {
         this.ticketSelected = null;
     }
 
-    onSearch(params) {
-        if (params)
-            this.$.model.applyFilter(null, params);
-        else
-            this.$.model.clear();
-    }
-
     showClientDescriptor(event, clientFk) {
         this.$.clientDescriptor.clientFk = clientFk;
         this.$.clientDescriptor.parent = event.target;
diff --git a/modules/order/front/main/index.html b/modules/order/front/main/index.html
index 09d498599..1aca6a48d 100644
--- a/modules/order/front/main/index.html
+++ b/modules/order/front/main/index.html
@@ -1,8 +1,15 @@
+<vn-crud-model
+    vn-id="model"
+    url="Orders/filter"
+    limit="20"
+    data="orders"
+    order="landed DESC, clientFk">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="order.index"
         panel="vn-order-search-panel"
-        info="Search orders by id">
+        info="Search orders by id"
+        model="model">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index c01112928..ab8b1364b 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -1,13 +1,5 @@
-<vn-crud-model
-    vn-id="model"
-    url="Routes/filter"
-    limit="20"
-    data="routes"
-    order="created DESC"
-    auto-load="true">
-</vn-crud-model>
 <vn-auto-search
-    on-search="$ctrl.onSearch($params)">
+    model="model">
 </vn-auto-search>
 <vn-data-viewer
     model="model"
@@ -27,7 +19,7 @@
             </vn-tr>
         </vn-thead>
         <vn-tbody>
-            <a ng-repeat="route in routes"
+            <a ng-repeat="route in model.data"
                 class="clickable vn-tr search-result"
                 ui-sref="route.card.summary({id: {{::route.id}}})">
                 <vn-td number>{{::route.id | dashIfEmpty}}</vn-td>
diff --git a/modules/route/front/index/index.js b/modules/route/front/index/index.js
index 8fdde810c..735581265 100644
--- a/modules/route/front/index/index.js
+++ b/modules/route/front/index/index.js
@@ -24,13 +24,6 @@ export default class Controller {
         this.routeSelected = route;
         this.$.summary.show();
     }
-
-    onSearch(params) {
-        if (params)
-            this.$.model.applyFilter(null, params);
-        else
-            this.$.model.clear();
-    }
 }
 Controller.$inject = ['$scope', 'vnToken'];
 
diff --git a/modules/route/front/main/index.html b/modules/route/front/main/index.html
index f6e097b24..2be8ab467 100644
--- a/modules/route/front/main/index.html
+++ b/modules/route/front/main/index.html
@@ -1,9 +1,16 @@
+<vn-crud-model
+    vn-id="model"
+    url="Routes/filter"
+    limit="20"
+    order="created DESC"
+    auto-load="true">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="route.index"
         panel="vn-route-search-panel"
         info="Search routes by id"
-        filter="$ctrl.filter">
+        filter="$ctrl.filter"
+        model="model">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index b303c3ae7..a0efea467 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -1,13 +1,5 @@
-<vn-crud-model
-    vn-id="model"
-    url="Tickets/filter"
-    limit="20"
-    params="::$ctrl.params"
-    data="tickets"
-    order="shipped DESC, zoneHour ASC, zoneMinute ASC, clientFk">
-</vn-crud-model>
 <vn-auto-search
-    on-search="$ctrl.onSearch($params)">
+    model="model">
     <append style="display: none;">
         <vn-icon-menu
             vn-id="more-button"
@@ -49,7 +41,7 @@
             </vn-tr>
         </vn-thead>
         <vn-tbody>
-            <a ng-repeat="ticket in tickets"
+            <a ng-repeat="ticket in model.data"
                 class="clickable vn-tr search-result"
                 ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
                 <vn-td shrink>
diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js
index 05dc23c08..a4606bb72 100644
--- a/modules/ticket/front/index/index.js
+++ b/modules/ticket/front/index/index.js
@@ -38,30 +38,6 @@ export default class Controller {
         this.$.balanceCreateDialog.description += description.join(', ');
     }
 
-    getScopeDates(days) {
-        const today = new Date();
-        today.setHours(0, 0, 0, 0);
-
-        const daysOnward = new Date(today);
-        daysOnward.setDate(today.getDate() + days);
-        daysOnward.setHours(23, 59, 59, 999);
-
-        return {from: today, to: daysOnward};
-    }
-
-    onSearch(params) {
-        if (params) {
-            if (typeof(params.scopeDays) === 'number')
-                Object.assign(params, this.getScopeDates(params.scopeDays));
-            // Set default params to 1 scope days
-            else if (Object.entries(params).length == 0)
-                params = this.getScopeDates(1);
-
-            this.$.model.applyFilter(null, params);
-        } else
-            this.$.model.clear();
-    }
-
     goToLines(event, ticketFk) {
         this.preventDefault(event);
         let url = this.$state.href('ticket.card.sale', {id: ticketFk}, {absolute: true});
diff --git a/modules/ticket/front/main/index.html b/modules/ticket/front/main/index.html
index 7e058f45d..bcb77cca5 100644
--- a/modules/ticket/front/main/index.html
+++ b/modules/ticket/front/main/index.html
@@ -1,8 +1,15 @@
+<vn-crud-model
+    vn-id="model"
+    url="Tickets/filter"
+    limit="20"
+    order="shipped DESC, zoneHour ASC, zoneMinute ASC, clientFk">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="ticket.index"
         panel="vn-ticket-search-panel"
-        info="Search ticket by id or alias">
+        info="Search ticket by id or alias"
+        model="model"
+        fetch-params="$ctrl.fetchParams($params)">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/ticket/front/main/index.js b/modules/ticket/front/main/index.js
index d6100daa3..bd4718176 100644
--- a/modules/ticket/front/main/index.js
+++ b/modules/ticket/front/main/index.js
@@ -1,7 +1,25 @@
 import ngModule from '../module';
 import ModuleMain from 'salix/components/module-main';
 
-export default class Ticket extends ModuleMain {}
+export default class Ticket extends ModuleMain {
+    fetchParams($params) {
+        if (!Object.entries($params).length)
+            $params.scopeDays = 1;
+
+        if (typeof $params.scopeDays === 'number') {
+            const from = new Date();
+            from.setHours(0, 0, 0, 0);
+
+            const to = new Date(from.getTime());
+            to.setDate(to.getDate() + $params.scopeDays);
+            to.setHours(23, 59, 59, 999);
+
+            Object.assign($params, {from, to});
+        }
+
+        return $params;
+    }
+}
 
 ngModule.vnComponent('vnTicket', {
     controller: Ticket,
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index 3af99eb6b..ba0272d3f 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -1,13 +1,6 @@
-<vn-crud-model
-    vn-id="model"
-    url="Travels/filter"
-    limit="20"
-    params="::$ctrl.params"
-    data="travels"
-    order="shipped DESC, landed DESC">
-</vn-crud-model>
+
 <vn-auto-search
-    on-search="$ctrl.onSearch($params)">
+    model="model">
 </vn-auto-search>
 <vn-data-viewer
     model="model"
diff --git a/modules/travel/front/index/index.js b/modules/travel/front/index/index.js
index a1e22d2e7..ca45f8452 100644
--- a/modules/travel/front/index/index.js
+++ b/modules/travel/front/index/index.js
@@ -12,29 +12,6 @@ export default class Controller {
         event.preventDefault();
         event.stopImmediatePropagation();
     }
-
-    getScopeDates(days) {
-        const today = new Date();
-        today.setHours(0, 0, 0, 0);
-        const daysOnward = new Date(today);
-        daysOnward.setDate(today.getDate() + days);
-        daysOnward.setHours(23, 59, 59, 999);
-        return {shippedFrom: today, shippedTo: daysOnward};
-    }
-
-    onSearch(params) {
-        if (params) {
-            let newParams = params;
-            if (params.scopeDays) {
-                const scopeDates = this.getScopeDates(params.scopeDays);
-                Object.assign(newParams, scopeDates);
-            } else if (Object.entries(params).length == 0)
-                newParams = this.getScopeDates(1);
-
-            this.$.model.applyFilter(null, newParams);
-        } else
-            this.$.model.clear();
-    }
 }
 
 Controller.$inject = ['$scope'];
diff --git a/modules/travel/front/main/index.html b/modules/travel/front/main/index.html
index 71b9462fe..9daecf6f8 100644
--- a/modules/travel/front/main/index.html
+++ b/modules/travel/front/main/index.html
@@ -1,8 +1,15 @@
+<vn-crud-model
+    vn-id="model"
+    url="Travels/filter"
+    limit="20"
+    order="shipped DESC, landed DESC">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="travel.index"
         panel="vn-travel-search-panel"
-        info="Search travels by id">
+        info="Search travels by id"
+        model="model"
+        fetch-params="$ctrl.fetchParams($params)">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/travel/front/main/index.js b/modules/travel/front/main/index.js
index 3be713973..f04cc750d 100644
--- a/modules/travel/front/main/index.js
+++ b/modules/travel/front/main/index.js
@@ -1,7 +1,25 @@
 import ngModule from '../module';
 import ModuleMain from 'salix/components/module-main';
 
-export default class Travel extends ModuleMain {}
+export default class Travel extends ModuleMain {
+    fetchParams($params) {
+        if (!Object.entries($params).length)
+            $params.scopeDays = 1;
+
+        if (typeof $params.scopeDays === 'number') {
+            const shippedFrom = new Date();
+            shippedFrom.setHours(0, 0, 0, 0);
+
+            const shippedTo = new Date(shippedFrom.getTime());
+            shippedTo.setDate(shippedTo.getDate() + $params.scopeDays);
+            shippedTo.setHours(23, 59, 59, 999);
+
+            Object.assign($params, {shippedFrom, shippedTo});
+        }
+
+        return $params;
+    }
+}
 
 ngModule.vnComponent('vnTravel', {
     controller: Travel,
diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html
index 56dde4609..dfab7f16a 100644
--- a/modules/worker/front/index/index.html
+++ b/modules/worker/front/index/index.html
@@ -1,12 +1,5 @@
-<vn-crud-model
-    vn-id="model"
-    url="Workers/filter"
-    limit="20"
-    order="id"
-    data="workers">
-</vn-crud-model>
 <vn-auto-search
-    on-search="$ctrl.onSearch($params)">
+    model="model">
 </vn-auto-search>
 <vn-data-viewer
     model="model"
@@ -14,7 +7,7 @@
     <vn-card>
         <div class="vn-list separated">
         <a 
-            ng-repeat="worker in workers track by worker.id"
+            ng-repeat="worker in model.data track by worker.id"
             ui-sref="worker.card.summary({id: worker.id})"
             translate-attr="{title: 'View worker'}"
             class="vn-item search-result">
diff --git a/modules/worker/front/index/index.js b/modules/worker/front/index/index.js
index 1cc9a8f92..1b585f013 100644
--- a/modules/worker/front/index/index.js
+++ b/modules/worker/front/index/index.js
@@ -9,13 +9,6 @@ export default class Controller {
         });
     }
 
-    onSearch(params) {
-        if (params)
-            this.$.model.applyFilter(null, params);
-        else
-            this.$.model.clear();
-    }
-
     preview(event, worker) {
         if (event.defaultPrevented) return;
 
@@ -26,7 +19,6 @@ export default class Controller {
         this.$.preview.show();
     }
 
-
     goToTimeControl(event, workerId) {
         if (event.defaultPrevented) return;
 
@@ -34,6 +26,7 @@ export default class Controller {
         event.stopPropagation();
         this.$state.go('worker.card.timeControl', {id: workerId}, {absolute: true});
     }
+
     onMoreChange(callback) {
         callback.call(this);
     }
diff --git a/modules/worker/front/main/index.html b/modules/worker/front/main/index.html
index 826a7905f..51948fedf 100644
--- a/modules/worker/front/main/index.html
+++ b/modules/worker/front/main/index.html
@@ -1,8 +1,14 @@
+<vn-crud-model
+    vn-id="model"
+    url="Workers/filter"
+    limit="20"
+    order="id">
+</vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="worker.index"
         panel="vn-worker-search-panel"
-        info="Search workers by id, firstName, lastName or user name">
+        info="Search workers by id, firstName, lastName or user name"
+        model="model">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">
diff --git a/modules/zone/front/location/index.html b/modules/zone/front/location/index.html
index 4b3523a1f..20755f916 100644
--- a/modules/zone/front/location/index.html
+++ b/modules/zone/front/location/index.html
@@ -4,25 +4,25 @@
     filter="::$ctrl.filter">
 </vn-crud-model>
 <vn-portal slot="topbar">
-    <vn-searchbar></vn-searchbar>
+    <vn-searchbar
+        on-search="$ctrl.onSearch($params)"
+        auto-state="false">
+    </vn-searchbar>
 </vn-portal>
-<vn-auto-search
-    on-search="$ctrl.onSearch($params)">
-</vn-auto-search>
 <div class="vn-w-md">
-    <vn-card class="vn-pa-lg vn-mt-md">
-        <vn-treeview
-            vn-id="treeview"
-            root-label="Locations"
-            fetch-func="$ctrl.onFetch($item)"
-            sort-func="$ctrl.onSort($a, $b)">
-            <vn-check acl-role="deliveryBoss"
-                ng-model="item.selected"
-                on-change="$ctrl.onSelection(value, item)" 
-                triple-state="true"
-                ng-click="$event.preventDefault()"
-                label="{{::item.name}}"> 
-            </vn-check>
-        </vn-treeview>
+    <vn-card class="vn-pa-lg">
+    <vn-treeview
+        vn-id="treeview"
+        root-label="Locations"
+        fetch-func="$ctrl.onFetch($item)"
+        sort-func="$ctrl.onSort($a, $b)">
+        <vn-check acl-role="deliveryBoss"
+            ng-model="item.selected"
+            on-change="$ctrl.onSelection(value, item)" 
+            triple-state="true"
+            ng-click="$event.preventDefault()"
+            label="{{::item.name}}"> 
+        </vn-check>
+    </vn-treeview>
     </vn-card>
 </div>
diff --git a/modules/zone/front/main/index.html b/modules/zone/front/main/index.html
index d6e63a1a6..d5a2b2b38 100644
--- a/modules/zone/front/main/index.html
+++ b/modules/zone/front/main/index.html
@@ -6,13 +6,10 @@
 </vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
-        search-state="zone.index"
-        panel="vn-zone-search-panel"
         info="Search zone by id or name"
+        panel="vn-zone-search-panel"
         model="model"
-        expr-builder="$ctrl.exprBuilder(param, value)"
-        go-state="zone.card.summary"
-        go-state-params="{id: $row.id}">
+        expr-builder="$ctrl.exprBuilder(param, value)">
     </vn-searchbar>
 </vn-portal>
 <vn-portal slot="menu">