diff --git a/src/router/hooks.js b/src/router/hooks.js
index 322af2fb0..e5d5288a9 100644
--- a/src/router/hooks.js
+++ b/src/router/hooks.js
@@ -51,14 +51,14 @@ export function setPageTitle(to) {
     const matches = to.matched;
     if (matches && matches.length > 1) {
         const module = matches[1];
-        const moduleTitle = module.meta && module.meta.title;
+        const moduleTitle = module.meta?.title;
         if (moduleTitle) {
             title = t(`globals.pageTitles.${moduleTitle}`);
         }
     }
 
     const childPage = to.meta;
-    const childPageTitle = childPage && childPage.title;
+    const childPageTitle = childPage?.title;
     if (childPageTitle && matches.length > 2) {
         if (title != '') title += ': ';
 
@@ -66,7 +66,7 @@ export function setPageTitle(to) {
         const pageTitle = te(moduleLocale)
             ? t(moduleLocale)
             : t(`globals.pageTitles.${childPageTitle}`);
-        const idParam = to.params && to.params.id;
+        const idParam = to.params?.id;
         const idPageTitle = `${idParam} - ${pageTitle}`;
         const builtTitle = idParam ? idPageTitle : pageTitle;
 
diff --git a/test/cypress/integration/entry/commands.js b/test/cypress/integration/entry/commands.js
index 7c96a5440..4d4a8f980 100644
--- a/test/cypress/integration/entry/commands.js
+++ b/test/cypress/integration/entry/commands.js
@@ -1,6 +1,6 @@
 Cypress.Commands.add('selectTravel', (warehouse = '1') => {
     cy.get('i[data-cy="Travel_icon"]').click();
-    cy.get('input[data-cy="Warehouse Out_select"]').type(warehouse);
+    cy.selectOption('input[data-cy="Warehouse Out_select"]', warehouse);
     cy.get('div[role="listbox"] > div > div[role="option"]').eq(0).click();
     cy.get('button[data-cy="save-filter-travel-form"]').click();
     cy.get('tr').eq(1).click();
@@ -9,7 +9,6 @@ Cypress.Commands.add('selectTravel', (warehouse = '1') => {
 Cypress.Commands.add('deleteEntry', () => {
     cy.get('[data-cy="descriptor-more-opts"]').should('be.visible').click();
     cy.waitForElement('div[data-cy="delete-entry"]').click();
-    cy.url().should('include', 'list');
 });
 
 Cypress.Commands.add('createEntry', () => {