Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs
===================================================================
diff -u -r66c5b52088c887ea6e342caa304350706146521a -r4c56c711499f9de8519c1e320b78aa4a82e22b0f
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs	(.../AutomatedSystemTestsRepository.cs)	(revision 66c5b52088c887ea6e342caa304350706146521a)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs	(.../AutomatedSystemTestsRepository.cs)	(revision 4c56c711499f9de8519c1e320b78aa4a82e22b0f)
@@ -884,7 +884,7 @@
             /// Creates a new ProjectExplorerPanel  folder.
             /// </summary>
             public ProjectExplorerPanelFolder(RepoGenBaseFolder parentFolder) :
-                    base("ProjectExplorerPanel", "*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']", parentFolder, 30000, null, false, "f5ed0b8b-7145-426f-982e-b89248da6d53", "")
+                    base("ProjectExplorerPanel", ".//container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']", parentFolder, 30000, null, false, "f5ed0b8b-7145-426f-982e-b89248da6d53", "")
             {
                 _trajectnode = new AutomatedSystemTestsRepositoryFolders.TrajectNodeFolder(this);
             }
@@ -1307,7 +1307,7 @@
             /// Creates a new MessagesDataGridView  folder.
             /// </summary>
             public MessagesDataGridViewFolder(RepoGenBaseFolder parentFolder) :
-                    base("MessagesDataGridView", "container/container/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']", parentFolder, 30000, null, false, "ebb0b0be-617b-4c07-a1f1-dd02286813f8", "")
+                    base("MessagesDataGridView", "container/tabpagelist/container/container[@controltypename='WinFormsAdapter']/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']", parentFolder, 30000, null, false, "ebb0b0be-617b-4c07-a1f1-dd02286813f8", "")
             {
                 _genericrowmessage = new AutomatedSystemTestsRepositoryFolders.GenericRowMessageFolder(this);
                 _lastrowmessage = new AutomatedSystemTestsRepositoryFolders.LastRowMessageFolder(this);
@@ -1500,7 +1500,7 @@
             /// Creates a new PropertiesPanelContainer  folder.
             /// </summary>
             public PropertiesPanelContainerFolder(RepoGenBaseFolder parentFolder) :
-                    base("PropertiesPanelContainer", "container/container[@controltypename='WinFormsAdapter']/container[@controlname='PropertiesPanelGridView']", parentFolder, 30000, null, false, "41bb0ddf-7a93-4518-a257-8322f257edf1", "")
+                    base("PropertiesPanelContainer", "tabpagelist//container[@controlname='PropertiesPanelGridView']", parentFolder, 30000, null, false, "41bb0ddf-7a93-4518-a257-8322f257edf1", "")
             {
                 _table = new AutomatedSystemTestsRepositoryFolders.TableFolder(this);
             }
@@ -1627,7 +1627,7 @@
             /// Creates a new DocumentViewContainer  folder.
             /// </summary>
             public DocumentViewContainerFolder(RepoGenBaseFolder parentFolder) :
-                    base("DocumentViewContainer", "container/container[@instance='1' and @controltypename='WinFormsAdapter']", parentFolder, 30000, null, false, "0577a18c-71af-4c1c-bb03-b668001706c5", "")
+                    base("DocumentViewContainer", "container//container[@instance='1' and @controltypename='WinFormsAdapter']", parentFolder, 30000, null, false, "0577a18c-71af-4c1c-bb03-b668001706c5", "")
             {
                 _fm_resultview = new AutomatedSystemTestsRepositoryFolders.FM_ResultViewFolder(this);
                 _assessmentsectionassemblycategoriesview = new AutomatedSystemTestsRepositoryFolders.AssessmentSectionAssemblyCategoriesViewFolder(this);
@@ -3456,7 +3456,7 @@
             /// Creates a new MapLegendPanel  folder.
             /// </summary>
             public MapLegendPanelFolder(RepoGenBaseFolder parentFolder) :
-                    base("MapLegendPanel", "*/*/container[@controlname='MapLegendView']/container", parentFolder, 30000, null, false, "b84d06d6-645e-4e5d-9705-593afd9b9f18", "")
+                    base("MapLegendPanel", "tabpagelist//container[@controlname='MapLegendView']/container", parentFolder, 30000, null, false, "b84d06d6-645e-4e5d-9705-593afd9b9f18", "")
             {
                 _rootnode = new AutomatedSystemTestsRepositoryFolders.RootNodeFolder(this);
             }
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep
===================================================================
diff -u -r66c5b52088c887ea6e342caa304350706146521a -r4c56c711499f9de8519c1e320b78aa4a82e22b0f
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep	(.../AutomatedSystemTestsRepository.rxrep)	(revision 66c5b52088c887ea6e342caa304350706146521a)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep	(.../AutomatedSystemTestsRepository.rxrep)	(revision 4c56c711499f9de8519c1e320b78aa4a82e22b0f)
@@ -44,22 +44,22 @@
 					refimgid="c33e2959-1eb3-434f-9ba5-7449b06b1808"
 					robustPath=""
 					searchtimeout="30000ms">
-						/form[@name='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename=$substringNameItemInTraject]
+						/form[@name='RiskeerMainWindow']//container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename=$substringNameItemInTraject]
 					</item>
 					<item
 					capname="treeitem"
 					id="fb1c8db8-131a-43d1-b4f3-bc523782f12f"
 					name="CurrentFocusInPE"
 					robustPath=""
 					searchtimeout="30000ms">
-						/form[@name='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]//treeitem[@hasfocus='true']
+						/form[@name='RiskeerMainWindow']//container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]//treeitem[@hasfocus='true']
 					</item>
 					<basepath>
-						/form[@name='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]
+						/form[@name='RiskeerMainWindow']//container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]
 					</basepath>
 				</folder>
 				<basepath>
-					/form[@name='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']
+					/form[@name='RiskeerMainWindow']//container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']
 				</basepath>
 			</folder>
 			<folder
@@ -155,10 +155,10 @@
 						refimgid="85d13c99-8b90-49f2-b235-29cc95822cea"
 						robustPath=""
 						searchtimeout="30000ms">
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename&lt;' '+$indexRowMessage]/cell[@accessiblename&gt;'Bericht']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container/tabpagelist/container/container[@controltypename='WinFormsAdapter']/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename&lt;' '+$indexRowMessage]/cell[@accessiblename&gt;'Bericht']
 						</item>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename&lt;' '+$indexRowMessage]
+							/form[@name='RiskeerMainWindow']/container/container[4]/container/tabpagelist/container/container[@controltypename='WinFormsAdapter']/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename&lt;' '+$indexRowMessage]
 						</basepath>
 					</folder>
 					<folder
@@ -176,14 +176,14 @@
 						refimgid="85d13c99-8b90-49f2-b235-29cc95822cea"
 						robustPath=""
 						searchtimeout="30000ms">
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename&lt;' 0']/cell[@accessiblename&gt;'Bericht']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container/tabpagelist/container/container[@controltypename='WinFormsAdapter']/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename&lt;' 0']/cell[@accessiblename&gt;'Bericht']
 						</item>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename&lt;' 0']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container/tabpagelist/container/container[@controltypename='WinFormsAdapter']/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']/row[@accessiblename&lt;' 0']
 						</basepath>
 					</folder>
 					<basepath>
-						/form[@name='RiskeerMainWindow']/container/container[4]/container/container/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']
+						/form[@name='RiskeerMainWindow']/container/container[4]/container/tabpagelist/container/container[@controltypename='WinFormsAdapter']/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']
 					</basepath>
 				</folder>
 				<folder
@@ -208,14 +208,14 @@
 						refimgid="b10e19f9-7815-4f72-bde5-ded05eaaa1a8"
 						robustPath=""
 						searchtimeout="30000ms">
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@controltypename='WinFormsAdapter']/container[@controlname='PropertiesPanelGridView']//table/row[@accessiblename&gt;$nameOfParameterInPropertiesPanel]
+							/form[@name='RiskeerMainWindow']/container/container[4]/tabpagelist//container[@controlname='PropertiesPanelGridView']//table/row[@accessiblename&gt;$nameOfParameterInPropertiesPanel]
 						</item>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@controltypename='WinFormsAdapter']/container[@controlname='PropertiesPanelGridView']//table
+							/form[@name='RiskeerMainWindow']/container/container[4]/tabpagelist//container[@controlname='PropertiesPanelGridView']//table
 						</basepath>
 					</folder>
 					<basepath>
-						/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@controltypename='WinFormsAdapter']/container[@controlname='PropertiesPanelGridView']
+						/form[@name='RiskeerMainWindow']/container/container[4]/tabpagelist//container[@controlname='PropertiesPanelGridView']
 					</basepath>
 				</folder>
 				<folder
@@ -255,7 +255,7 @@
 								name="IsRelevant"
 								robustPath=""
 								searchtimeout="30000ms">
-									/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[$rowIndex]/cell[@accessiblename&gt;'Is relevant']
+									/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[$rowIndex]/cell[@accessiblename&gt;'Is relevant']
 								</item>
 								<item
 								capname="cell"
@@ -277,14 +277,14 @@
 AAAOxAAADsQBlSsOGwAAABpJREFUKFNjWIkE/iOBUQkwgIqBwfCQ+P8fAGPSjZDfAro7AAAAAElF
 TkSuQmCC
 									</image>
-									/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[$rowIndex]/cell[$columnIndex]
+									/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[$rowIndex]/cell[$columnIndex]
 								</item>
 								<basepath>
-									/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[$rowIndex]
+									/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[$rowIndex]
 								</basepath>
 							</folder>
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']
 							</basepath>
 						</folder>
 						<item
@@ -295,7 +295,7 @@
 						refimgid="25125f59-3167-4e83-964d-f177d497aa21"
 						robustPath=""
 						searchtimeout="30000ms">
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/text/text
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/text/text
 						</item>
 						<item
 						addcaps="button,accessible"
@@ -305,7 +305,7 @@
 						refimgid="dea0a4fb-3797-4b3d-b25c-a6c5305bcf98"
 						robustPath=""
 						searchtimeout="30000ms">
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/combobox[@controlname='probabilityResultTypeComboBox']/button
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/combobox[@controlname='probabilityResultTypeComboBox']/button
 						</item>
 						<item
 						addcaps="text,control,nativewindow"
@@ -315,10 +315,10 @@
 						refimgid="5f1048c5-6ba3-4d22-adaf-7a50cf07dd08"
 						robustPath=""
 						searchtimeout="30000ms">
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/text[@controlname='failureMechanismAssemblyProbabilityTextBox']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/text[@controlname='failureMechanismAssemblyProbabilityTextBox']
 						</item>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']
 						</basepath>
 					</folder>
 					<folder
@@ -343,14 +343,14 @@
 							refimgid="38fb642d-8c44-4bc4-a95e-ac1550e74f82"
 							robustPath=""
 							searchtimeout="10000ms">
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssessmentSectionAssemblyGroupsView']/container[@controlname='assemblyGroupsTable']/table[@controlname='dataGridView']/row[@accessiblevalue&gt;$categoryName+';']/cell[@accessiblename&gt;$boundaryTypeSubstring]
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssessmentSectionAssemblyGroupsView']/container[@controlname='assemblyGroupsTable']/table[@controlname='dataGridView']/row[@accessiblevalue&gt;$categoryName+';']/cell[@accessiblename&gt;$boundaryTypeSubstring]
 							</item>
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssessmentSectionAssemblyGroupsView']/container[@controlname='assemblyGroupsTable']/table[@controlname='dataGridView']
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssessmentSectionAssemblyGroupsView']/container[@controlname='assemblyGroupsTable']/table[@controlname='dataGridView']
 							</basepath>
 						</folder>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssessmentSectionAssemblyGroupsView']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssessmentSectionAssemblyGroupsView']
 						</basepath>
 					</folder>
 					<folder
@@ -367,10 +367,10 @@
 						name="TableDuidingsklassen"
 						robustPath=""
 						searchtimeout="30000ms">
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismSectionAssemblyGroupsView']//table
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismSectionAssemblyGroupsView']//table
 						</item>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismSectionAssemblyGroupsView']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismSectionAssemblyGroupsView']
 						</basepath>
 					</folder>
 					<folder
@@ -410,14 +410,14 @@
 									name="WaterLevelOrWaveHeightNthRow"
 									robustPath=""
 									searchtimeout="30000ms">
-										/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container/table/row[@accessiblename&lt;' '+$rowIndex]/cell[@accessiblename&gt;'Waterstand' or @accessiblename&gt;'Golfhoogte']
+										/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container/table/row[@accessiblename&lt;' '+$rowIndex]/cell[@accessiblename&gt;'Waterstand' or @accessiblename&gt;'Golfhoogte']
 									</item>
 									<basepath>
-										/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container/table/row[@accessiblename&lt;' '+$rowIndex]
+										/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container/table/row[@accessiblename&lt;' '+$rowIndex]
 									</basepath>
 								</folder>
 								<basepath>
-									/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container/table
+									/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container/table
 								</basepath>
 							</folder>
 							<folder
@@ -435,18 +435,18 @@
 								refimgid="ba5af28f-bcce-4282-b479-4b08a62225bd"
 								robustPath=""
 								searchtimeout="30000ms">
-									/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container[@controlname&gt;'button']/button[@controlname='calculateForSelectedButton']
+									/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container[@controlname&gt;'button']/button[@controlname='calculateForSelectedButton']
 								</item>
 								<basepath>
-									/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container[@controlname&gt;'button']
+									/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container/container[@controlname&gt;'button']
 								</basepath>
 							</folder>
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container/container[@controlname='panel1']/container
 							</basepath>
 						</folder>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'CalculationsView']/container
 						</basepath>
 					</folder>
 					<folder
@@ -471,10 +471,10 @@
 							name="GenericSection"
 							robustPath=""
 							searchtimeout="30000ms">
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/?/list/list/listitem[@index=$indexSection]
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/?/list/list/listitem[@index=$indexSection]
 							</item>
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/?/list/list
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/?/list/list
 							</basepath>
 						</folder>
 						<folder
@@ -491,14 +491,14 @@
 							name="GenericRowContribution"
 							robustPath=""
 							searchtimeout="30000ms">
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/container/container/?/table/row[@accessiblename='Row 0']/cell[@accessiblename&gt;'Bijdrage aanscenario[%]']
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/container/container/?/table/row[@accessiblename='Row 0']/cell[@accessiblename&gt;'Bijdrage aanscenario[%]']
 							</item>
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/container/container/?/table
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/container/container/?/table
 							</basepath>
 						</folder>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']
 						</basepath>
 					</folder>
 					<folder
@@ -522,18 +522,18 @@
 							name="GenericRowHydraulicBCDunes"
 							robustPath=""
 							searchtimeout="30000ms">
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container/table/row[@accessiblename&lt;' '+$indexRow]
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container/table/row[@accessiblename&lt;' '+$indexRow]
 							</item>
 							<item
 							capname="cell"
 							id="f7409335-be4e-4a2b-a1e6-498adf52b16a"
 							name="CellCalculatedWaterLevelDA"
 							robustPath=""
 							searchtimeout="30000ms">
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container/table/row[@accessiblename&lt;' '+$rowIndex]/cell[@accessiblename&gt;'Rekenwaarde waterstand']
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container/table/row[@accessiblename&lt;' '+$rowIndex]/cell[@accessiblename&gt;'Rekenwaarde waterstand']
 							</item>
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container/table
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container/table
 							</basepath>
 						</folder>
 						<folder
@@ -551,14 +551,14 @@
 							refimgid="d609c052-4854-4151-bece-1434d8df9ce5"
 							robustPath=""
 							searchtimeout="30000ms">
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container[@controlname&gt;'button']/button[@controlname='calculateForSelectedButton']
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container[@controlname&gt;'button']/button[@controlname='calculateForSelectedButton']
 							</item>
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container[@controlname&gt;'button']
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container/container[@controlname&gt;'button']
 							</basepath>
 						</folder>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname&gt;'Dune']/container
 						</basepath>
 					</folder>
 					<item
@@ -569,7 +569,7 @@
 					refimgid="0c3dda7b-fc8d-4d81-90cb-b69e67b32fc5"
 					robustPath=""
 					searchtimeout="30000ms">
-						/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'SectionsView']/?/table
+						/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'SectionsView']/?/table
 					</item>
 					<folder
 					capname="container"
@@ -595,10 +595,10 @@
 							refimgid="73e8e71a-615c-40ab-a491-def024b12128"
 							robustPath=""
 							searchtimeout="30000ms">
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultTotalView']/container/container/container/text[@controlname='groupLabel']
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultTotalView']/container/container/container/text[@controlname='groupLabel']
 							</item>
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultTotalView']/container/container/container
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultTotalView']/container/container/container
 							</basepath>
 						</folder>
 						<folder
@@ -609,11 +609,11 @@
 						searchtimeout="30000ms"
 						usecache="False">
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultTotalView']/container/table
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultTotalView']/container/table
 							</basepath>
 						</folder>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultTotalView']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultTotalView']
 						</basepath>
 					</folder>
 					<folder
@@ -632,11 +632,11 @@
 						searchtimeout="30000ms"
 						usecache="False">
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultPerSectionView']/container/table
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultPerSectionView']/container/table
 							</basepath>
 						</folder>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultPerSectionView']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultPerSectionView']
 						</basepath>
 					</folder>
 					<folder
@@ -671,18 +671,18 @@
 								refimgid="e6f04d45-5018-46d5-ab95-911e5c9e48ce"
 								robustPath=""
 								searchtimeout="30000ms">
-									/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='CalculationsView']//table/row[@accessiblename='Row '+$indexRowCalculation]/cell[@accessiblename&gt;$nameColumn]
+									/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='CalculationsView']//table/row[@accessiblename='Row '+$indexRowCalculation]/cell[@accessiblename&gt;$nameColumn]
 								</item>
 								<basepath>
-									/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='CalculationsView']//table/row[@accessiblename='Row '+$indexRowCalculation]
+									/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='CalculationsView']//table/row[@accessiblename='Row '+$indexRowCalculation]
 								</basepath>
 							</folder>
 							<basepath>
-								/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='CalculationsView']//table
+								/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='CalculationsView']//table
 							</basepath>
 						</folder>
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='CalculationsView']
+							/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='CalculationsView']
 						</basepath>
 					</folder>
 					<item
@@ -691,10 +691,10 @@
 					name="SecurityCategoriesViewTable"
 					robustPath=""
 					searchtimeout="30000ms">
-						/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssessmentSectionAssemblyGroupsView']/?/?/table
+						/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='AssessmentSectionAssemblyGroupsView']/?/?/table
 					</item>
 					<basepath>
-						/form[@name='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']
+						/form[@name='RiskeerMainWindow']/container/container[4]/container//container[@instance='1' and @controltypename='WinFormsAdapter']
 					</basepath>
 				</folder>
 				<folder
@@ -714,11 +714,11 @@
 					searchtimeout="30000ms"
 					usecache="False">
 						<basepath>
-							/form[@name='RiskeerMainWindow']/container/container[4]/*/*/container[@controlname='MapLegendView']/container/tree/tree/treeitem
+							/form[@name='RiskeerMainWindow']/container/container[4]/tabpagelist//container[@controlname='MapLegendView']/container/tree/tree/treeitem
 						</basepath>
 					</folder>
 					<basepath>
-						/form[@name='RiskeerMainWindow']/container/container[4]/*/*/container[@controlname='MapLegendView']/container
+						/form[@name='RiskeerMainWindow']/container/container[4]/tabpagelist//container[@controlname='MapLegendView']/container
 					</basepath>
 				</folder>
 				<basepath>
Index: System tests/AutomatedSystemTests/Ranorex.rxsettings
===================================================================
diff -u -r7c32c70d70ee001606d3aa277fd993f6c65c7fe8 -r4c56c711499f9de8519c1e320b78aa4a82e22b0f
--- System tests/AutomatedSystemTests/Ranorex.rxsettings	(.../Ranorex.rxsettings)	(revision 7c32c70d70ee001606d3aa277fd993f6c65c7fe8)
+++ System tests/AutomatedSystemTests/Ranorex.rxsettings	(.../Ranorex.rxsettings)	(revision 4c56c711499f9de8519c1e320b78aa4a82e22b0f)
@@ -1,5 +1,5 @@
 <configuration
-rxversion="10.7">
+rxversion="11.0">
 	<adapter.defaultsearchtimeout>
 		10000ms
 	</adapter.defaultsearchtimeout>