diff --git a/commands.js b/commands.js
index 346c223e7d8dfac094cfc914cc536468da83b254..c3dbff535962fa87e9659327541fd0653a9c8c08 100644
--- a/commands.js
+++ b/commands.js
@@ -68,22 +68,23 @@ Cypress.Commands.add('deleteTestTaxonomyTerms', () => {
 })
 
 Cypress.Commands.add('assertFieldCondition', (data) => {
+    let field = '#edit-' + data.field.replaceAll('_', '-')
     if (data.check !== undefined) {
         if (data.check) {
-            cy.get('#' + data.field + '-value').check()
+            cy.get(field + '-value').check()
         }
         else {
-            cy.get('#' + data.field + '-value').uncheck()
+            cy.get(field + '-value').uncheck()
         }
     }
     else if (data.select !== undefined) {
-        cy.get('#' + data.field + '-value').select(data.select)
+        cy.get(field).select(data.select)
     }
     else if (data.value !== undefined) {
-        cy.get('#' + data.field + '-value').type(data.value)
+        cy.get(field + '-value').type(data.value)
     }
     else {
-        cy.get('#' + data.field + '-wrapper').as('field')
+        cy.get(field + '-wrapper').as('field')
         if (data.visible) {
             cy.get('@field').should('be.visible')
         } else {