Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs
===================================================================
diff -u -rcb0f4da23098feff3fb123c47b1e11c774cec2a8 -r6a0b3fd7c244d905077d111c666a0c15775bd036
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs	(.../AutomatedSystemTestsRepository.cs)	(revision cb0f4da23098feff3fb123c47b1e11c774cec2a8)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs	(.../AutomatedSystemTestsRepository.cs)	(revision 6a0b3fd7c244d905077d111c666a0c15775bd036)
@@ -1215,7 +1215,7 @@
             /// Creates a new HeaderOpenViews  folder.
             /// </summary>
             public HeaderOpenViewsFolder(RepoGenBaseFolder parentFolder) :
-                    base("HeaderOpenViews", "container[11]/?/?/button[@automationid='MenuDropDownButton']", parentFolder, 30000, null, false, "b2c76482-93c5-4171-9eaf-0f674aebb65b", "")
+                    base("HeaderOpenViews", "?/?/?/button[@automationid='MenuDropDownButton']", parentFolder, 30000, null, false, "b2c76482-93c5-4171-9eaf-0f674aebb65b", "")
             {
                 _viewclosebuttonInfo = new RepoItemInfo(this, "ViewCloseButton", "?/tabpage/button[@automationid='DocumentCloseButton']", "", 30000, null, "79aa5f18-da55-4d5b-9c7c-bc833052d329");
                 _textheaderpanelInfo = new RepoItemInfo(this, "textHeaderPanel", "container[@automationid='HeaderPanel']/tabpage/?/text[@text>$nameMap]", "", 30000, null, "71969c09-ef02-4547-bddc-6e74e1272049");
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep
===================================================================
diff -u -rcb0f4da23098feff3fb123c47b1e11c774cec2a8 -r6a0b3fd7c244d905077d111c666a0c15775bd036
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep	(.../AutomatedSystemTestsRepository.rxrep)	(revision cb0f4da23098feff3fb123c47b1e11c774cec2a8)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep	(.../AutomatedSystemTestsRepository.rxrep)	(revision 6a0b3fd7c244d905077d111c666a0c15775bd036)
@@ -116,7 +116,7 @@
 					refimgid="db245c00-dff8-4d3c-aafb-9cbcb5b3a1cb"
 					robustPath=""
 					searchtimeout="30000ms">
-						/form[@name='RiskeerMainWindow']/container/container[4]/container[11]/?/?/button[@automationid='MenuDropDownButton']/?/tabpage/button[@automationid='DocumentCloseButton']
+						/form[@name='RiskeerMainWindow']/container/container[4]/?/?/?/button[@automationid='MenuDropDownButton']/?/tabpage/button[@automationid='DocumentCloseButton']
 					</item>
 					<item
 					addcaps="text,wpfelement"
@@ -126,10 +126,10 @@
 					refimgid="eb4a8025-5cf6-4dd3-9fec-2688dceb885e"
 					robustPath=""
 					searchtimeout="30000ms">
-						/form[@name='RiskeerMainWindow']/container/container[4]/container[11]/?/?/button[@automationid='MenuDropDownButton']/container[@automationid='HeaderPanel']/tabpage/?/text[@text&gt;$nameMap]
+						/form[@name='RiskeerMainWindow']/container/container[4]/?/?/?/button[@automationid='MenuDropDownButton']/container[@automationid='HeaderPanel']/tabpage/?/text[@text&gt;$nameMap]
 					</item>
 					<basepath>
-						/form[@name='RiskeerMainWindow']/container/container[4]/container[11]/?/?/button[@automationid='MenuDropDownButton']
+						/form[@name='RiskeerMainWindow']/container/container[4]/?/?/?/button[@automationid='MenuDropDownButton']
 					</basepath>
 				</folder>
 				<folder