diff --git a/client/agency/src/create/index.spec.js b/client/agency/src/create/index.spec.js
index ca378e2588..d380cfa47a 100644
--- a/client/agency/src/create/index.spec.js
+++ b/client/agency/src/create/index.spec.js
@@ -1,5 +1,5 @@
 import './index';
-import {watcher} from '../../../../helpers/watcherHelper';
+import {watcher} from '../../../helpers/watcherHelper';
 
 describe('Agency', () => {
     describe('Component vnZoneCreate', () => {
diff --git a/client/order/src/card/index.js b/client/order/src/card/index.js
index f5c88f3817..3b3e2524cf 100644
--- a/client/order/src/card/index.js
+++ b/client/order/src/card/index.js
@@ -32,7 +32,7 @@ class Controller {
         let json = encodeURIComponent(JSON.stringify(this.filter));
         let query = `/order/api/Orders/${this.$state.params.id}?filter=${json}`;
         this.$http.get(query).then(res => {
-            if (res.data) {
+            if (res.data && res.data.rows) {
                 if (res.data.rows.length == 0)
                     delete res.data.rows;
                 this.order = res.data;
diff --git a/client/order/src/card/index.spec.js b/client/order/src/card/index.spec.js
index 3d843852a2..0b9f791b2c 100644
--- a/client/order/src/card/index.spec.js
+++ b/client/order/src/card/index.spec.js
@@ -26,11 +26,11 @@ describe('Order', () => {
             it(`should make a query, save the data in order and call get order if the response has data`, () => {
                 spyOn(controller, 'getTotal');
                 let json = encodeURIComponent(JSON.stringify(controller.filter));
-                $httpBackend.expectGET(`/order/api/Orders/${controller.$state.params.id}?filter=${json}`).respond({id: 1});
+                $httpBackend.expectGET(`/order/api/Orders/${controller.$state.params.id}?filter=${json}`).respond({rows: [1, 2, 3]});
                 controller.getCard();
                 $httpBackend.flush();
 
-                expect(controller.order).toEqual({id: 1});
+                expect(controller.order).toEqual({rows: [1, 2, 3]});
                 expect(controller.getTotal).toHaveBeenCalledWith();
             });