Change get by ID value in all cypress_test

-  according to previous change(commit) we need to adjust ID in cypress test files

Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: Ic5510392b101ff7c7daa28719a60963c7bb2c743

22 files changed, 104 insertions, 104 deletions

diff --git a/cypress_test/integration_tests/common/calc_helper.js b/cypress_test/integration_tests/common/calc_helper.js
index 44ecb515c6..89cfc35231 100644
--- a/cypress_test/integration_tests/common/calc_helper.js
+++ b/cypress_test/integration_tests/common/calc_helper.js
@@ -61,7 +61,7 @@ function clickOnFirstCell(firstClick = true, dblClick = false, isA1 = true) {
 	}
 
 	if (isA1)
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 
 	cy.log('<< clickOnFirstCell - end');
 }
@@ -124,7 +124,7 @@ function removeTextSelection() {
 
 				moveY += 1.0;
 				var regex = /A([0-9]+):(AMJ|XFD)\1$/;
-				return cy.cGet('input#addressInput')
+				return cy.cGet('input#addressInput-input')
 					.should('have.prop', 'value')
 					.then(function(value) {
 						return regex.test(value);
@@ -160,7 +160,7 @@ function selectEntireSheet() {
 	});
 
 	var regex = /^A1:(AMJ|XFD)1048576$/;
-	cy.cGet('input#addressInput')
+	cy.cGet('input#addressInput-input')
 		.should('have.prop', 'value')
 		.then(function(value) {
 			return regex.test(value);
@@ -186,7 +186,7 @@ function selectFirstColumn() {
 			cy.cGet('body').click(XPos, YPos);
 		});
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1:A1048576');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1:A1048576');
 
 	cy.log('<< selectFirstColumn - end');
 }
@@ -237,7 +237,7 @@ function assertDataClipboardTable(expectedData) {
 function selectCellsInRange(range) {
 	cy.log('>> selectCellsInRange - start');
 
-	cy.cGet('#formulabar #addressInput')
+	cy.cGet('#formulabar #addressInput-input')
 		.clear()
 		.type(range + '{enter}');
 
diff --git a/cypress_test/integration_tests/desktop/calc/cell_cursor_spec.js b/cypress_test/integration_tests/desktop/calc/cell_cursor_spec.js
index 46a5f464c1..4a99c8ad5b 100644
--- a/cypress_test/integration_tests/desktop/calc/cell_cursor_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/cell_cursor_spec.js
@@ -16,7 +16,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Test jumping on large cell
 	it('No jump on long merged cell', function() {
 		desktopHelper.assertScrollbarPosition('horizontal', 205, 315);
 		calcHelper.clickOnFirstCell(true, false, false);
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1:Z1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1:Z1');
 		desktopHelper.assertScrollbarPosition('horizontal', 205, 315);
 	});
 });
@@ -42,7 +42,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Test jumping on large cell
 			cy.cGet('body').click(XPos, YPos);
 		});
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'B2:AA2');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'B2:AA2');
 		desktopHelper.assertScrollbarPosition('horizontal', 270, 390);
 	});
 });
diff --git a/cypress_test/integration_tests/desktop/calc/clipboard_spec.js b/cypress_test/integration_tests/desktop/calc/clipboard_spec.js
index 77b651cd4b..3f8572e997 100644
--- a/cypress_test/integration_tests/desktop/calc/clipboard_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/clipboard_spec.js
@@ -59,7 +59,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Calc clipboard tests.', fu
 		cy.cGet('#map').focus();
 		calcHelper.clickOnFirstCell();
 		// A1 is 1, B1 is 2, so C1 is 3.
-		helper.typeIntoInputField('input#addressInput', 'C1');
+		helper.typeIntoInputField('input#addressInput-input', 'C1');
 		cy.window().then(win => {
 			var app = win['0'].app;
 			app.socket.sendMessage('uno .uno:Copy');
@@ -68,7 +68,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Calc clipboard tests.', fu
 		setDummyClipboard('text/html', html);
 
 		// When pasting C1 to D1:
-		helper.typeIntoInputField('input#addressInput', 'D1');
+		helper.typeIntoInputField('input#addressInput-input', 'D1');
 		cy.cGet('#home-paste-button').click();
 		cy.cGet('#home-paste-entries .ui-combobox-entry').contains('Paste').click();
 
@@ -153,7 +153,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Calc clipboard tests.', fu
 		// Given a document with an A1 cell copied to the clipboard:
 		cy.cGet('#map').focus();
 		calcHelper.clickOnFirstCell();
-		helper.typeIntoInputField('input#addressInput', 'A1');
+		helper.typeIntoInputField('input#addressInput-input', 'A1');
 		cy.window().then(win => {
 			var app = win['0'].app;
 			app.socket.sendMessage('uno .uno:Copy');
@@ -162,7 +162,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Calc clipboard tests.', fu
 		setDummyClipboard('text/html', html, /*image=*/false, /*fail=*/true);
 
 		// When pasting the clipboard to B1, which fails:
-		helper.typeIntoInputField('input#addressInput', 'B1');
+		helper.typeIntoInputField('input#addressInput-input', 'B1');
 		cy.cGet('#home-paste-button').click();
 		cy.cGet('#home-paste-entries .ui-combobox-entry').contains('Paste').click();
 
diff --git a/cypress_test/integration_tests/desktop/calc/navigator_spec.js b/cypress_test/integration_tests/desktop/calc/navigator_spec.js
index e2c35bc15d..355041b107 100644
--- a/cypress_test/integration_tests/desktop/calc/navigator_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/navigator_spec.js
@@ -15,18 +15,18 @@ describe.skip(['tagdesktop'], 'Navigator tests.', function () {
 	it('Jump to element. Navigator -> Document', function() {
 		// Doubleclick several items, and check if the view is jumed to there
 		cy.cGet('#contentbox').contains('.jsdialog.sidebar.ui-treeview-cell-text', 'Comment1').dblclick();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'O81');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'O81');
 		cy.cGet('#StatusDocPos').should('have.text', 'Sheet 3 of 24');
 
 		cy.cGet('#contentbox').contains('.jsdialog.sidebar.ui-treeview-cell-text', 'Sheet22').dblclick();
 		cy.cGet('#StatusDocPos').should('have.text', 'Sheet 22 of 24');
 
 		cy.cGet('#contentbox').contains('.jsdialog.sidebar.ui-treeview-cell-text', 'rName1').dblclick();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'rName1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'rName1');
 		cy.cGet('#StatusDocPos').should('have.text', 'Sheet 2 of 24');
 
 		cy.cGet('#contentbox').contains('.jsdialog.sidebar.ui-treeview-cell-text', 'dRange').dblclick();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'S21:T22');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'S21:T22');
 		cy.cGet('#StatusDocPos').should('have.text', 'Sheet 3 of 24');
 	});
 
@@ -56,7 +56,7 @@ describe.skip(['tagdesktop'], 'Navigator tests.', function () {
 
 		// Check if clicking on it will move cursor there
 		cy.cGet('#contentbox').contains('.jsdialog.sidebar.ui-treeview-cell-text', 'rName2').dblclick();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'rName2');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'rName2');
 		cy.cGet('#StatusDocPos').should('have.text', 'Sheet 5 of 24');
 
 		// Insert a comment
diff --git a/cypress_test/integration_tests/desktop/calc/searchbar_spec.js b/cypress_test/integration_tests/desktop/calc/searchbar_spec.js
index 631a531ed8..ac0a96e7ce 100644
--- a/cypress_test/integration_tests/desktop/calc/searchbar_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/searchbar_spec.js
@@ -16,18 +16,18 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Searching via search bar.'
 		searchHelper.searchNext();
 
 		// First cell should be selected
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 	});
 
 	it('Search not existing word.', function() {
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A2');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A2');
 
 		searchHelper.typeIntoSearchField('q');
 
 		// Should be no new selection
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A2');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A2');
 	});
 
 	it('Search next / prev instance.', function() {
@@ -35,21 +35,21 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Searching via search bar.'
 		searchHelper.typeIntoSearchField('a');
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
 		// Search next instance
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'B1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'B1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
 		// Search prev instance
 		searchHelper.searchPrev();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 	});
@@ -60,21 +60,21 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Searching via search bar.'
 
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
 		// Search next instance
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'B1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'B1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
 		// Search next instance, which is in the beginning of the document.
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 	});
@@ -85,7 +85,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Searching via search bar.'
 
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
diff --git a/cypress_test/integration_tests/desktop/calc/sheet_operation_spec.js b/cypress_test/integration_tests/desktop/calc/sheet_operation_spec.js
index ed6fddf464..54f0b2e9d8 100644
--- a/cypress_test/integration_tests/desktop/calc/sheet_operation_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/sheet_operation_spec.js
@@ -17,13 +17,13 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Sheet Operations.', functi
 
 	it.skip('Switching sheet sets the view that contains cell-cursor', function () {
 		calcHelper.assertNumberofSheets(1);
-		helper.typeIntoInputField('input#addressInput', 'A1');
+		helper.typeIntoInputField('input#addressInput-input', 'A1');
 		calcHelper.ensureViewContainsCellCursor();
 		cy.cGet('#spreadsheet-toolbar #insertsheet').click();
 		calcHelper.assertNumberofSheets(2);
 		cy.cGet('#spreadsheet-tab1').click();
 		calcHelper.ensureViewContainsCellCursor();
-		helper.typeIntoInputField('input#addressInput', 'A200');
+		helper.typeIntoInputField('input#addressInput-input', 'A200');
 		calcHelper.ensureViewContainsCellCursor();
 		cy.cGet('#spreadsheet-tab0').click();
 		calcHelper.ensureViewContainsCellCursor();
diff --git a/cypress_test/integration_tests/desktop/calc/sheet_switch_spec.js b/cypress_test/integration_tests/desktop/calc/sheet_switch_spec.js
index 731181427b..4de2c22fbb 100644
--- a/cypress_test/integration_tests/desktop/calc/sheet_switch_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/sheet_switch_spec.js
@@ -16,29 +16,29 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Sheet switching tests', fu
 		cy.cGet('#spreadsheet-tab0').click();
 
 		desktopHelper.assertScrollbarPosition('vertical', 35, 45);
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'G45');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'G45');
 
 		// go to sheet 2
 		cy.cGet('#spreadsheet-tab1').click();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'F720');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'F720');
 		desktopHelper.assertScrollbarPosition('vertical', 320, 330);
 
-		cy.cGet('input#addressInput').type('{selectAll}A2{enter}');
+		cy.cGet('input#addressInput-input').type('{selectAll}A2{enter}');
 		desktopHelper.assertScrollbarPosition('vertical', 15, 25);
 	});
 
 	it('Check view position on repeated selection of currently selected sheet', function() {
 		// initially we are on sheet 2 tab
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'F720');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'F720');
 		desktopHelper.assertScrollbarPosition('vertical', 320, 330);
 
 		// click on sheet 2 tab (yes, current one)
 		cy.cGet('#spreadsheet-tab1').click();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'F720');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'F720');
 		desktopHelper.assertScrollbarPosition('vertical', 320, 330);
 
 		// go to different place in the spreadsheet
-		cy.cGet('input#addressInput').type('{selectAll}A2{enter}');
+		cy.cGet('input#addressInput-input').type('{selectAll}A2{enter}');
 		desktopHelper.assertScrollbarPosition('vertical', 15, 25);
 
 		// validate we didn't jump back after some time
@@ -52,7 +52,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Sheet switching tests', fu
 		cy.cGet('#spreadsheet-tab0').click();
 
 		desktopHelper.assertScrollbarPosition('vertical', 35, 45);
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'G45');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'G45');
 		cy.cGet('#spreadsheet-tab0').should('have.class', 'spreadsheet-tab-selected');
 		cy.cGet('#spreadsheet-tab1').should('not.have.class', 'spreadsheet-tab-selected');
 
@@ -61,7 +61,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Sheet switching tests', fu
 
 		// we expect no effect
 		desktopHelper.assertScrollbarPosition('vertical', 35, 45);
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'G45');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'G45');
 		cy.cGet('#spreadsheet-tab0').should('have.class', 'spreadsheet-tab-selected');
 		cy.cGet('#spreadsheet-tab1').should('not.have.class', 'spreadsheet-tab-selected');
 	});
@@ -73,7 +73,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Sheet switching tests', fu
 		cy.cGet('#spreadsheet-tab0').click();
 
 		desktopHelper.assertScrollbarPosition('vertical', 35, 45);
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'G45');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'G45');
 		cy.cGet('#spreadsheet-tab0').should('have.class', 'spreadsheet-tab-selected');
 		cy.cGet('#spreadsheet-tab1').should('not.have.class', 'spreadsheet-tab-selected');
 
@@ -81,7 +81,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Sheet switching tests', fu
 		helper.typeIntoDocument('{ctrl}{shift}{pageDown}');
 
 		desktopHelper.assertScrollbarPosition('vertical', 320, 330);
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'F720');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'F720');
 		cy.cGet('#spreadsheet-tab0').should('have.class', 'spreadsheet-tab-selected');
 		cy.cGet('#spreadsheet-tab1').should('have.class', 'spreadsheet-tab-selected');
 
@@ -89,14 +89,14 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Sheet switching tests', fu
 		helper.typeIntoDocument('{ctrl}{alt}{pageUp}');
 
 		// we still have selected two sheets so we see cell data from sheet 2
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'F720');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'F720');
 
 		// go to sheet 2 using tab
 		cy.cGet('#spreadsheet-tab1').click();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'F720');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'F720');
 
 		// go to different place in the spreadsheet
-		cy.cGet('input#addressInput').type('{selectAll}A2{enter}');
+		cy.cGet('input#addressInput-input').type('{selectAll}A2{enter}');
 		helper.typeIntoDocument('some text');
 
 		// validate we didn't jump back after some time
diff --git a/cypress_test/integration_tests/desktop/calc/statusbar_spec.js b/cypress_test/integration_tests/desktop/calc/statusbar_spec.js
index 37aa2631b9..873ee9076a 100644
--- a/cypress_test/integration_tests/desktop/calc/statusbar_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/statusbar_spec.js
@@ -24,9 +24,9 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Statubar tests.', function
 
 	it('Multiple cell selection.', function() {
 		cy.cGet('#RowColSelCount').should('have.text', 'Select multiple cells');
-		helper.typeIntoInputField('input#addressInput', 'A1:A2');
+		helper.typeIntoInputField('input#addressInput-input', 'A1:A2');
 		cy.cGet('#RowColSelCount').should('have.text', 'Selected: 2 rows, 1 column');
-		helper.typeIntoInputField('input#addressInput', 'A1');
+		helper.typeIntoInputField('input#addressInput-input', 'A1');
 		cy.cGet('#RowColSelCount').should('have.text', 'Select multiple cells');
 	});
 
@@ -40,9 +40,9 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Statubar tests.', function
 
 	it('Selected data summary.', function() {
 		cy.cGet('#StateTableCell').should('have.text', 'Average: ; Sum: 0');
-		helper.typeIntoInputField('input#addressInput', 'A1:A2');
+		helper.typeIntoInputField('input#addressInput-input', 'A1:A2');
 		cy.cGet('#StateTableCell').should('have.text', 'Average: 15.5; Sum: 31');
-		helper.typeIntoInputField('input#addressInput', 'A1');
+		helper.typeIntoInputField('input#addressInput-input', 'A1');
 		cy.cGet('#StateTableCell').should('have.text', 'Average: 10; Sum: 10');
 	});
 
diff --git a/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js b/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js
index 00f945459c..ff57c4d9e8 100644
--- a/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js
@@ -75,7 +75,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 		// Leave cell
 		helper.typeIntoDocument('{enter}');
 		// Wait for enter to work before clicking on first cell again
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A2');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A2');
 		cy.wait(100);
 
 		// Turn text wrap on
@@ -85,7 +85,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 		// Leave cell
 		helper.typeIntoDocument('{enter}');
 		// Wait for enter to work before clicking on first cell again
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A2');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A2');
 		cy.wait(100);
 
 		// Get cursor position at end of line after wrap
diff --git a/cypress_test/integration_tests/desktop/writer/file_properties_spec.js b/cypress_test/integration_tests/desktop/writer/file_properties_spec.js
index a636ce7faa..43d80da490 100644
--- a/cypress_test/integration_tests/desktop/writer/file_properties_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/file_properties_spec.js
@@ -14,10 +14,10 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'File Property Tests', func
 	it('Add File Description.', function() {
 		writerHelper.openFileProperties();
 		cy.cGet('#tabcontrol-2').click();
-		helper.waitUntilIdle('#title.ui-edit');
-		cy.cGet('#title.ui-edit').type('New Title');
+		helper.waitUntilIdle('#title-input.ui-edit');
+		cy.cGet('#title-input.ui-edit').type('New Title');
 		// sometimes it doesn't finish typing
-		helper.waitUntilIdle('#title.ui-edit');
+		helper.waitUntilIdle('#title-input.ui-edit');
 
 		// Fixme: type now char by char because we receive update messages
 		//        can be reverted after core update
@@ -33,7 +33,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'File Property Tests', func
 		writerHelper.openFileProperties();
 
 		cy.cGet('#tabcontrol-2').click();
-		cy.cGet('#title.ui-edit').should('have.value', 'New Title');
+		cy.cGet('#title-input.ui-edit').should('have.value', 'New Title');
 		cy.cGet('#comments.ui-textarea').should('have.value', 'New');
 
 		cy.cGet('#cancel.ui-pushbutton').click();
@@ -49,14 +49,14 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'File Property Tests', func
 		helper.waitUntilIdle('#namebox');
 		cy.cGet('#namebox select').select('Mailstop');
 
-		helper.waitUntilIdle('#valueedit');
-		cy.cGet('#valueedit').type('123 Address');
+		helper.waitUntilIdle('#value-input');
+		cy.cGet('#valueedit-input').type('123 Address');
 		cy.cGet('#ok.ui-pushbutton').click();
 
 		// Check property saved
 		writerHelper.openFileProperties();
 		cy.cGet('#customprops-tab-label').click();
-		cy.cGet('#valueedit.ui-edit').should('have.value', '123 Address');
+		cy.cGet('#valueedit-input.ui-edit').should('have.value', '123 Address');
 
 		cy.cGet('#cancel.ui-pushbutton').click();
 	});
@@ -85,7 +85,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'File Property Tests', func
 		// Check property saved
 		writerHelper.openFileProperties();
 		cy.cGet('#customprops-tab-label').click();
-		cy.cGet('#duration.ui-edit').should('have.value', '- Y: 1 M: 0 D: 2 H: 0 M: 0 S: 3');
+		cy.cGet('#duration-input.ui-edit').should('have.value', '- Y: 1 M: 0 D: 2 H: 0 M: 0 S: 3');
 		cy.cGet('#cancel.ui-pushbutton').click();
 	});
 
@@ -99,7 +99,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'File Property Tests', func
 		helper.waitUntilIdle('#namebox');
 		cy.cGet('#namebox select').select('Telephone number');
 		helper.waitUntilIdle('#typebox');
-		cy.cGet('#typebox select').select('Yes or no');
+		cy.cGet('#typebox-input select').select('Yes or no');
 		helper.waitUntilIdle('#yes-input');
 		cy.cGet('#yes-input').check();
 		cy.cGet('#ok.ui-pushbutton').click();
diff --git a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js
index c3d25cc473..d359e525a2 100644
--- a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js
@@ -249,9 +249,9 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 		cy.wait(500);
 		cy.cGet('#Insert-tab-label').click();
 		cy.cGet('#Insert-container .hyperlinkdialog button').click();
-		cy.cGet('#hyperlink-link-box').should('exist');
+		cy.cGet('#hyperlink-link-box-input').should('exist');
 		cy.cGet('#hyperlink-text-box').type('link');
-		cy.cGet('#hyperlink-link-box').type('www.something.com');
+		cy.cGet('#hyperlink-link-box-input').type('www.something.com');
 		cy.cGet('#response-ok').click();
 		helper.copy();
 		helper.expectTextForClipboard('text text1link');
diff --git a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
index eeea29b85a..553c08865e 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
@@ -20,7 +20,7 @@ function selectFirstRow() {
 		.should('not.be.visible');
 
 	var regex = /^A1:(AMJ|XFD)1$/;
-	cy.cGet('input#addressInput')
+	cy.cGet('input#addressInput-input')
 		.should('have.prop', 'value')
 		.then(function(value) {
 			return regex.test(value);
diff --git a/cypress_test/integration_tests/mobile/calc/formulabar_spec.js b/cypress_test/integration_tests/mobile/calc/formulabar_spec.js
index 69225dd3d8..505b585726 100644
--- a/cypress_test/integration_tests/mobile/calc/formulabar_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/formulabar_spec.js
@@ -17,12 +17,12 @@ describe(['tagmobile', 'tagnextcloud'], 'Formula bar tests.', function() {
 		calcHelper.clickOnFirstCell();
 
 		// Select a different cell using address input.
-		helper.typeIntoInputField('input#addressInput', 'B2');
+		helper.typeIntoInputField('input#addressInput-input', 'B2');
 
 		cy.cGet('.spreadsheet-cell-resize-marker[style=\'visibility: visible; transform: translate3d(-8px, -8px, 0px); z-index: -8;\']')
 			.should('not.exist');
 
-		helper.typeIntoInputField('input#addressInput', 'A1');
+		helper.typeIntoInputField('input#addressInput-input', 'A1');
 
 		cy.cGet('.spreadsheet-cell-resize-marker').should('exist');
 	});
@@ -32,7 +32,7 @@ describe(['tagmobile', 'tagnextcloud'], 'Formula bar tests.', function() {
 		calcHelper.clickOnFirstCell();
 
 		// Select a cell range using address input.
-		helper.typeIntoInputField('input#addressInput', 'B2:B3');
+		helper.typeIntoInputField('input#addressInput-input', 'B2:B3');
 
 		cy.cGet('.spreadsheet-cell-resize-marker[style=\'visibility: visible; transform: translate3d(-8px, -8px, 0px); z-index: -8;\']')
 			.should('not.exist');
@@ -43,7 +43,7 @@ describe(['tagmobile', 'tagnextcloud'], 'Formula bar tests.', function() {
 		cy.cGet('.spreadsheet-cell-resize-marker').should('exist');
 
 		// Select a cell range again using address input.
-		helper.typeIntoInputField('input#addressInput', 'B2:B3');
+		helper.typeIntoInputField('input#addressInput-input', 'B2:B3');
 
 		cy.cGet('.spreadsheet-cell-resize-marker[style=\'visibility: visible; transform: translate3d(-8px, -8px, 0px); z-index: -8;\']')
 			.should('not.exist');
@@ -57,7 +57,7 @@ describe(['tagmobile', 'tagnextcloud'], 'Formula bar tests.', function() {
 		helper.expectTextForClipboard('long line long line long line');
 
 		// A2 cell is empty
-		helper.typeIntoInputField('input#addressInput', 'A2');
+		helper.typeIntoInputField('input#addressInput-input', 'A2');
 
 		cy.cGet('[id="test-div-auto fill marker"]').should('exist');
 
diff --git a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
index 3a2033003d..c215cc11f3 100644
--- a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
@@ -90,7 +90,7 @@ describe.skip(['tagmobile'], 'Trigger hamburger menu options.', function() {
 		// Undo
 		mobileHelper.selectHamburgerMenuItem(['Edit', 'Undo']);
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 
 		calcHelper.selectEntireSheet();
 
@@ -99,7 +99,7 @@ describe.skip(['tagmobile'], 'Trigger hamburger menu options.', function() {
 		// Redo
 		mobileHelper.selectHamburgerMenuItem(['Edit', 'Redo']);
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		calcHelper.selectEntireSheet();
 		cy.cGet('#copy-paste-container table td').should('contain.text', 'q');
 	});
@@ -119,7 +119,7 @@ describe.skip(['tagmobile'], 'Trigger hamburger menu options.', function() {
 		// Revert one undo step via Repair
 		repairHelper.rollbackPastChange('Undo', undefined, true);
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 
 		calcHelper.selectEntireSheet();
 
@@ -174,7 +174,7 @@ describe.skip(['tagmobile'], 'Trigger hamburger menu options.', function() {
 		cy.cGet('#search').should('not.have.attr', 'disabled');
 		cy.cGet('#search').click();
 		// First cell should be selected
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 	});
 
 	it('Sheet: insert row before.', function() {
diff --git a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
index 18f33342d4..070e210f4a 100644
--- a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
@@ -57,14 +57,14 @@ describe(['tagmobile', 'tagnextcloud'], 'Calc insertion wizard.', function() {
 			.click();
 
 		// Dialog is opened
-		cy.cGet('#target')
+		cy.cGet('#target-input')
 			.should('exist');
 
 		// Type text and link
-		cy.cGet('#indication')
+		cy.cGet('#indication-input')
 			.clear()
 			.type('some text');
-		cy.cGet('#target')
+		cy.cGet('#target-input')
 			.type('www.something.com');
 
 		// Insert
diff --git a/cypress_test/integration_tests/mobile/calc/overlays_spec.js b/cypress_test/integration_tests/mobile/calc/overlays_spec.js
index 8825d57b4c..8493c5c529 100644
--- a/cypress_test/integration_tests/mobile/calc/overlays_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/overlays_spec.js
@@ -19,13 +19,13 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Overlay bounds.', function
 		var cellA1Bounds = new helper.Bounds();
 		helper.getOverlayItemBounds('#test-div-overlay-cell-cursor-border-0', cellA1Bounds);
 
-		helper.typeIntoInputField('input#addressInput', 'C3');
+		helper.typeIntoInputField('input#addressInput-input', 'C3');
 
 		var cellC3Bounds = new helper.Bounds();
 		helper.overlayItemHasDifferentBoundsThan('#test-div-overlay-cell-cursor-border-0', cellA1Bounds);
 		helper.getOverlayItemBounds('#test-div-overlay-cell-cursor-border-0', cellC3Bounds);
 
-		helper.typeIntoInputField('input#addressInput', 'B2');
+		helper.typeIntoInputField('input#addressInput-input', 'B2');
 
 		cy.wrap(true).then(function () {
 			cy.log('cellA1Bounds = ' + cellA1Bounds + ', cellC3Bounds = ' + cellC3Bounds);
@@ -49,13 +49,13 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Overlay bounds.', function
 		var cellA1Bounds = new helper.Bounds();
 		helper.getOverlayItemBounds('#test-div-overlay-cell-cursor-border-0', cellA1Bounds);
 
-		helper.typeIntoInputField('input#addressInput', 'D4');
+		helper.typeIntoInputField('input#addressInput-input', 'D4');
 
 		var cellD4Bounds = new helper.Bounds();
 		helper.overlayItemHasDifferentBoundsThan('#test-div-overlay-cell-cursor-border-0', cellA1Bounds);
 		helper.getOverlayItemBounds('#test-div-overlay-cell-cursor-border-0', cellD4Bounds);
 
-		helper.typeIntoInputField('input#addressInput', 'A1:D4');
+		helper.typeIntoInputField('input#addressInput-input', 'A1:D4');
 
 		cy.wrap(true).then(function () {
 			cy.log('cellA1Bounds = ' + cellA1Bounds + ', cellD4Bounds = ' + cellD4Bounds);
diff --git a/cypress_test/integration_tests/mobile/calc/searchbar_spec.js b/cypress_test/integration_tests/mobile/calc/searchbar_spec.js
index 76f73486db..b035b0efec 100644
--- a/cypress_test/integration_tests/mobile/calc/searchbar_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/searchbar_spec.js
@@ -21,18 +21,18 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Searching via search bar.',
 		searchHelper.searchNext();
 
 		// First cell should be selected
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 	});
 
 	it('Search not existing word.', function() {
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A2');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A2');
 
 		searchHelper.typeIntoSearchField('q');
 
 		// Should be no new selection
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A2');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A2');
 	});
 
 	it('Search next / prev instance.', function() {
@@ -40,21 +40,21 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Searching via search bar.',
 		searchHelper.typeIntoSearchField('a');
 
 		searchHelper.searchNext();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
 		// Search next instance
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'B1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'B1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
 		// Search prev instance
 		searchHelper.searchPrev();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 	});
@@ -65,19 +65,19 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Searching via search bar.',
 
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
 		// Search next instance
 		searchHelper.searchNext();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'B1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'B1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
 		// Search next instance, which is in the beginning of the document.
 		searchHelper.searchNext();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 	});
@@ -88,7 +88,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Searching via search bar.',
 
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
@@ -102,7 +102,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Searching via search bar.',
 		searchHelper.typeIntoSearchField('a');
 		searchHelper.searchNext();
 
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 		helper.copy();
 		cy.cGet('#copy-paste-container table td').should('have.text', 'a');
 
diff --git a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
index fe9b2868ef..9430a5c7fa 100644
--- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
@@ -114,10 +114,10 @@ describe(['tagmobile', 'tagnextcloud'], 'Impress insertion wizard.', function()
 		// Open hyperlink dialog
 		cy.cGet('body').contains('.menu-entry-with-icon', 'Hyperlink...').click();
 		// Dialog is opened
-		cy.cGet('#hyperlink-link-box').should('exist');
+		cy.cGet('#hyperlink-link-box-input').should('exist');
 		// Type text and link
 		cy.cGet('#hyperlink-text-box').type('some text');
-		cy.cGet('#hyperlink-link-box').type('www.something.com');
+		cy.cGet('#hyperlink-link-box-input').type('www.something.com');
 		// Insert
 		cy.cGet('#response-ok').click();
 		// TODO: we have some wierd shape here instead of a text shape with the link
@@ -255,10 +255,10 @@ describe(['tagmobile', 'tagnextcloud'], 'Impress insertion wizard.', function()
 		// Open hyperlink dialog
 		cy.cGet('body').contains('.menu-entry-with-icon', 'Hyperlink...').click();
 		// Dialog is opened
-		cy.cGet('#hyperlink-link-box').should('exist');
+		cy.cGet('#hyperlink-link-box-input').should('exist');
 		// Type text and link
 		cy.cGet('#hyperlink-text-box').type('some text');
-		cy.cGet('#hyperlink-link-box').type('www.something.com');
+		cy.cGet('#hyperlink-link-box-input').type('www.something.com');
 		// Insert
 		cy.cGet('#response-ok').click();
 		// Check the text
diff --git a/cypress_test/integration_tests/mobile/writer/insert_content_control_spec.js b/cypress_test/integration_tests/mobile/writer/insert_content_control_spec.js
index c02b097383..8a60a608e3 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_content_control_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_content_control_spec.js
@@ -30,8 +30,8 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Insert objects via insertio
 		// Add new entry
 		cy.cGet('body').contains('button', 'Add').click();
 		cy.cGet('#mobile-wizard-title').should('have.text', 'Content Control List Item Properties');
-		cy.cGet('#displayname').type('some text');
-		cy.cGet('#value').type('something');
+		cy.cGet('#displayname-input').type('some text');
+		cy.cGet('#value-input').type('something');
 		cy.cGet('#ContentControlListItemDialog button#ok').click();
 
 		// Verify we are back in parent window and added entries
diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index 40f349b8f0..779fd132f3 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -189,10 +189,10 @@ describe(['tagmobile', 'tagnextcloud'], 'Insert objects via insertion wizard.',
 		// Open hyperlink dialog
 		cy.cGet('body').contains('.menu-entry-with-icon', 'Hyperlink...').click();
 		// Dialog is opened
-		cy.cGet('#hyperlink-link-box').should('exist');
+		cy.cGet('#hyperlink-link-box-input').should('exist');
 		// Type text and link
 		cy.cGet('#hyperlink-text-box').type('some text');
-		cy.cGet('#hyperlink-link-box').type('www.something.com');
+		cy.cGet('#hyperlink-link-box-input').type('www.something.com');
 		// Insert
 		cy.cGet('#response-ok').click();
 		writerHelper.selectAllTextOfDoc();
@@ -206,10 +206,10 @@ describe(['tagmobile', 'tagnextcloud'], 'Insert objects via insertion wizard.',
 		// Open hyperlink dialog
 		cy.cGet('body').contains('.menu-entry-with-icon', 'Hyperlink...').click();
 		// Dialog is opened
-		cy.cGet('#hyperlink-link-box').should('exist');
+		cy.cGet('#hyperlink-link-box-input').should('exist');
 		// Type text and link
 		cy.cGet('#hyperlink-text-box').type('some text');
-		cy.cGet('#hyperlink-link-box').type('www.something.com');
+		cy.cGet('#hyperlink-link-box-input').type('www.something.com');
 		// Insert
 		cy.cGet('#response-ok').click();
 		helper.typeIntoDocument('{leftArrow}');
diff --git a/cypress_test/integration_tests/multiuser/calc/invalidations_spec.js b/cypress_test/integration_tests/multiuser/calc/invalidations_spec.js
index 366e785581..a0fb65e37e 100644
--- a/cypress_test/integration_tests/multiuser/calc/invalidations_spec.js
+++ b/cypress_test/integration_tests/multiuser/calc/invalidations_spec.js
@@ -22,10 +22,10 @@ describe(['tagmultiuser'], 'Joining a document should not trigger an invalidatio
 		cy.cGet('#InsertMode').should('have.text', 'Insert');
 		helper.typeIntoDocument('{enter}');
 		cy.cGet('#InsertMode').should('have.text', 'Insert mode: inactive');
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A2');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A2');
 		helper.typeIntoDocument('{uparrow}');
 		// wait until round trip of cell address
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 
 		cy.cGet('.empty-deltas').then(($before) => {
 			const beforeCount = $before.text();
@@ -41,10 +41,10 @@ describe(['tagmultiuser'], 'Joining a document should not trigger an invalidatio
 			helper.documentChecks();
 
 			cy.cSetActiveFrame('#iframe1');
-			cy.cGet('input#addressInput').should('have.prop', 'value', 'A1');
+			cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A1');
 			// wait until round trip of cell address
 			helper.typeIntoDocument('{rightarrow}');
-			cy.cGet('input#addressInput').should('have.prop', 'value', 'B1');
+			cy.cGet('input#addressInput-input').should('have.prop', 'value', 'B1');
 
 			cy.cGet('.empty-deltas').should(($after) => {
 				expect($after.text()).to.eq(beforeCount);
diff --git a/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js b/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
index b423692176..f56dd72865 100644
--- a/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
+++ b/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
@@ -67,7 +67,7 @@ describe(['tagmultiuser'], 'Check overlays after tab switching/operations', func
 	it('Check cell cursor overlay bounds after switching tab', function () {
 		cy.cSetActiveFrame('#iframe1');
 		cy.cGet('#spreadsheet-tab1').click();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A14');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A14');
 
 		let cellA14Bounds = new helper.Bounds();
 		helper.getOverlayItemBounds('#test-div-overlay-cell-cursor-border-0', cellA14Bounds);
@@ -75,7 +75,7 @@ describe(['tagmultiuser'], 'Check overlays after tab switching/operations', func
 		cy.cSetActiveFrame('#iframe2');
 		// Check that cell cursor have the same bounds in both views
 		cy.cGet('#spreadsheet-tab1').click();
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'A14');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'A14');
 		helper.overlayItemHasBounds('#test-div-overlay-cell-cursor-border-0', cellA14Bounds);
 	});
 
@@ -104,11 +104,11 @@ describe(['tagmultiuser'], 'Check overlays after tab switching/operations', func
 
 	it('Check cell view cursor overlay bounds after inserting a new tab', function () {
 		cy.cSetActiveFrame('#iframe1');
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'D8');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'D8');
 
 		cy.cSetActiveFrame('#iframe2');
-		helper.typeIntoInputField('input#addressInput', 'F6');
-		cy.cGet('input#addressInput').should('have.prop', 'value', 'F6');
+		helper.typeIntoInputField('input#addressInput-input', 'F6');
+		cy.cGet('input#addressInput-input').should('have.prop', 'value', 'F6');
 
 		cy.cSetActiveFrame('#iframe1');
 		cy.cGet('#insertsheet').click();