diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 81f610a2c..58f4652f6 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -207,7 +207,7 @@ const getLocale = (label) => {
         color="primary"
         style="position: fixed; z-index: 1; right: 0; bottom: 0"
         icon="search"
-        data-cy="search"
+        data-cy="vnFilterPanel_search"
         @click="search()"
     >
         <QTooltip bottom anchor="bottom right">
diff --git a/test/cypress/integration/Order/orderCatalog.spec.js b/test/cypress/integration/Order/orderCatalog.spec.js
index 050dd396c..8ff6f4240 100644
--- a/test/cypress/integration/Order/orderCatalog.spec.js
+++ b/test/cypress/integration/Order/orderCatalog.spec.js
@@ -2,7 +2,7 @@
 describe('OrderCatalog', () => {
     beforeEach(() => {
         cy.login('developer');
-        cy.viewport(1920, 720);
+        cy.viewport(1920, 1080);
         cy.visit('/#/order/8/catalog');
     });
 
diff --git a/test/cypress/integration/monitor/clientActions.spec.js b/test/cypress/integration/monitor/clientActions.spec.js
index 5208c6410..44dea1df8 100644
--- a/test/cypress/integration/monitor/clientActions.spec.js
+++ b/test/cypress/integration/monitor/clientActions.spec.js
@@ -24,13 +24,13 @@ describe('Monitor Clients actions', () => {
         cy.dataCy('DepartmentDescriptor').should('exist');
 
         cy.dataCy('clientsOnWebsite')
-            .find(' .q-ml-md')
+            .find('.q-ml-md')
             .should('have.text', 'Clients on website');
         cy.dataCy('recentOrderActions')
             .find('.q-ml-md')
             .should('have.text', 'Recent order actions');
-        cy.get('[data-cy="From_inputDate"]').should('have.value', '01/01/2001');
-        cy.get('[data-cy="To_inputDate"]').should('have.value', '01/01/2001');
+        cy.dataCy('From_inputDate').should('have.value', '01/01/2001');
+        cy.dataCy('To_inputDate').should('have.value', '01/01/2001');
         cy.get(`${clientFk} [data-cy="_select"]`).click();
         cy.clickOption();
         cy.countTableRows('eq', 0);
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index d49ee0bb3..674a597d4 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -107,13 +107,6 @@ Cypress.Commands.add('waitSpinner', () => {
         }
     });
 });
-// Cypress.Commands.add('waitRightSpinner', () => {
-//     cy.get('body').then(($body) => {
-//         if ($body.find('.q-inner-loading').length) {
-//             cy.get('.q-inner-loading').should('not.be.visible');
-//         }
-//     });
-// });
 
 // Fill Inputs
 Cypress.Commands.add('selectOption', (selector, option, timeout = 2500) => {
diff --git a/test/cypress/support/index.js b/test/cypress/support/index.js
index 54eb5db30..e9042c8fc 100644
--- a/test/cypress/support/index.js
+++ b/test/cypress/support/index.js
@@ -68,7 +68,7 @@ const waitForApiReady = (url, maxRetries = 20, delay = 1000) => {
 };
 
 before(() => {
-    cy.viewport(1920, 720);
+    cy.viewport(1920, 1080);
     waitForApiReady('/api/Applications/status');
 });