diff --git a/packages/navigation/README.md b/packages/navigation/README.md
index 6a8646500..293c0a714 100644
--- a/packages/navigation/README.md
+++ b/packages/navigation/README.md
@@ -32,7 +32,7 @@ Throughout this tutorial we will add features for navigating to pages and bookma
 >
 > You can view and download the files for all steps in the Demo Kit at [Navigation and Routing](https://sdk.openui5.org/#/entity/sap.ui.core.tutorial.navigation). Copy the code to your workspace and make sure that the application runs by calling the `webapp/index.html` file. Depending on your development environment you might have to adjust resource paths and configuration entries.
 >
-> For more information check the [Downloading Code for a Tutorial Step](https://sdk.openui5.org/topic/8b49fc198bf04b2d9800fc37fecbb218.html#loio8b49fc198bf04b2d9800fc37fecbb218/tutorials_download) section of the tutorials overview page [Get Started: Setup, Tutorials, and Demo Apps](https://sdk.openui5.org/topic/8b49fc198bf04b2d9800fc37fecbb218).
+> For more information, see the [Downloading Code for a Tutorial Step](https://sdk.openui5.org/#/topic/8b49fc198bf04b2d9800fc37fecbb218#loio8b49fc198bf04b2d9800fc37fecbb218/tutorials_download) section of the [Get Started: Setup, Tutorials, and Demo Apps](https://sdk.openui5.org/#/topic/8b49fc198bf04b2d9800fc37fecbb218) overview.
 
 ***
 
diff --git a/packages/navigation/steps/01/webapp/index-cdn.html b/packages/navigation/steps/01/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/01/webapp/index-cdn.html
+++ b/packages/navigation/steps/01/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/02/README.md b/packages/navigation/steps/02/README.md
index d7bba447d..04bb5fb73 100644
--- a/packages/navigation/steps/02/README.md
+++ b/packages/navigation/steps/02/README.md
@@ -124,6 +124,7 @@ import UIComponent from "sap/ui/core/UIComponent";
 export default class Component extends UIComponent {
 
 	public static metadata = {
+		interfaces: ["sap.ui.core.IAsyncContentCreation"],
 		manifest: "json"
 	};
 
diff --git a/packages/navigation/steps/02/webapp/index-cdn.html b/packages/navigation/steps/02/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/02/webapp/index-cdn.html
+++ b/packages/navigation/steps/02/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/03/webapp/index-cdn.html b/packages/navigation/steps/03/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/03/webapp/index-cdn.html
+++ b/packages/navigation/steps/03/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/04/webapp/index-cdn.html b/packages/navigation/steps/04/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/04/webapp/index-cdn.html
+++ b/packages/navigation/steps/04/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/05/webapp/index-cdn.html b/packages/navigation/steps/05/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/05/webapp/index-cdn.html
+++ b/packages/navigation/steps/05/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/06/webapp/index-cdn.html b/packages/navigation/steps/06/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/06/webapp/index-cdn.html
+++ b/packages/navigation/steps/06/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/07/webapp/index-cdn.html b/packages/navigation/steps/07/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/07/webapp/index-cdn.html
+++ b/packages/navigation/steps/07/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/08/webapp/index-cdn.html b/packages/navigation/steps/08/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/08/webapp/index-cdn.html
+++ b/packages/navigation/steps/08/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/08/webapp/initMockServer.ts b/packages/navigation/steps/08/webapp/initMockServer.ts
index ab3be0548..66e2bfadd 100644
--- a/packages/navigation/steps/08/webapp/initMockServer.ts
+++ b/packages/navigation/steps/08/webapp/initMockServer.ts
@@ -1,7 +1,6 @@
 import mockserver from "ui5/tutorial/navigation/localService/mockserver";
 import MessageBox from "sap/m/MessageBox";
 
-// initialize the mock server
 mockserver.init().catch((error: Error) => {
   MessageBox.error(error.message);
 }).finally(() => {
diff --git a/packages/navigation/steps/09/webapp/index-cdn.html b/packages/navigation/steps/09/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/09/webapp/index-cdn.html
+++ b/packages/navigation/steps/09/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/10/webapp/index-cdn.html b/packages/navigation/steps/10/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/10/webapp/index-cdn.html
+++ b/packages/navigation/steps/10/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/11/README.md b/packages/navigation/steps/11/README.md
index ad275e703..41624a0b1 100644
--- a/packages/navigation/steps/11/README.md
+++ b/packages/navigation/steps/11/README.md
@@ -386,47 +386,36 @@ export default class EmployeeOverviewContent extends BaseController {
 		if (searchQuery?.length > 0) {
 			const filters: Filter[] = [];
 
-			aFilters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
-			aFilters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
-			oFilter = new Filter({ filters: aFilters, and: false }); // OR filter
+			filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
+			filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
+			filter = new Filter({ filters: filters, and: false }); // OR filter
 		}
 
 		// update list binding
 		const binding = (<ListBinding> this.table.getBinding("items"));
-		binding.filter(oFilter, "Application");
+		binding.filter(filter, "Application");
 	}
 
 	/**
 	 * Applies sorting on our table control.
 	 * @param {string} fieldName the name of the field used for sorting
-	 * @param {string} sortDescending true or false as a string or boolean value to specify a descending sorting
+	 * @param {boolean} sortDescending whether to sort descending
 	 * @private
 	 */
-	private _applySorter(fieldName: string, sortDescending: string | boolean): void {
+	private _applySorter(fieldName: string, sortDescending: boolean): void {
 		// only continue if we have a valid sort field
 		if (fieldName && this.validSortFields.includes(fieldName)) {
-			let descending: boolean;
-
-			// convert the sort order to a boolean value
-			if (typeof sortDescending === "string") {
-				descending = sortDescending === "true";
-			} else if (typeof sortDescending === "boolean") {
-				descending = sortDescending;
-			} else {
-				descending = false;
-			}
-
 			// sort only if the sorter has changed
-			if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
+			if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
 				return;
 			}
 
 			this.sortField = fieldName;
-			this.sortDescending = descending;
-			const sorter = new Sorter(fieldName, descending);
+			this.sortDescending = sortDescending;
+			const sorter = new Sorter(fieldName, sortDescending);
 
 			// sync with View Settings Dialog
-			this._syncViewSettingsDialogSorter(fieldName, descending);
+			this._syncViewSettingsDialogSorter(fieldName, sortDescending);
 
 			const binding = (<ListBinding> this.table.getBinding("items"));
 			binding.sort(sorter);
@@ -517,33 +506,22 @@ sap.ui.define(["sap/m/ViewSettingsDialog", "sap/m/ViewSettingsItem", "ui5/tutori
 	/**
 	 * Applies sorting on our table control.
 	 * @param {string} fieldName the name of the field used for sorting
-	 * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
+	 * @param {boolean} sortDescending whether to sort descending
 	 * @private
 	 */
 	_applySorter(fieldName, sortDescending) {
 	  // only continue if we have a valid sort field
 	  if (fieldName && this.validSortFields.includes(fieldName)) {
-		let descending;
-
-		// convert the sort order to a boolean value
-		if (typeof sortDescending === "string") {
-		  descending = sortDescending === "true";
-		} else if (typeof sortDescending === "boolean") {
-		  descending = sortDescending;
-		} else {
-		  descending = false;
-		}
-
 		// sort only if the sorter has changed
-		if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
+		if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
 		  return;
 		}
 		this.sortField = fieldName;
-		this.sortDescending = descending;
-		const sorter = new Sorter(fieldName, descending);
+		this.sortDescending = sortDescending;
+		const sorter = new Sorter(fieldName, sortDescending);
 
 		// sync with View Settings Dialog
-		this._syncViewSettingsDialogSorter(fieldName, descending);
+		this._syncViewSettingsDialogSorter(fieldName, sortDescending);
 		const binding = this.table.getBinding("items");
 		binding.sort(sorter);
 	  }
diff --git a/packages/navigation/steps/11/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts b/packages/navigation/steps/11/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
index 90a0b88fe..06cbd8edc 100644
--- a/packages/navigation/steps/11/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
+++ b/packages/navigation/steps/11/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
@@ -1,131 +1,120 @@
-import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
-import Table from "sap/m/Table";
-import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent } from "sap/m/ViewSettingsDialog";
-import ViewSettingsItem from "sap/m/ViewSettingsItem";
-import BaseController from "ui5/tutorial/navigation/controller/BaseController";
-import Filter from "sap/ui/model/Filter";
-import FilterOperator from "sap/ui/model/FilterOperator";
-import ListBinding from "sap/ui/model/ListBinding";
-import Sorter from "sap/ui/model/Sorter";
-
-/**
- * @namespace ui5.tutorial.navigation.controller.employee.overview
- */
-export default class EmployeeOverviewContent extends BaseController {
-
-  private table: Table;
-  private viewSettingsDialog: ViewSettingsDialog;
-  private sortField: string | null = null;
-  private sortDescending: boolean = false;
-  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
-  private searchQuery: string | null = null;
-
-  public onInit(): void {
-    this.table = (<Table> this.byId("employeesTable"));
-    this._initViewSettingsDialog();
-  }
-
-  public onSortButtonPressed(): void {
-    this.viewSettingsDialog.open();
-  }
-
-  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
-    this._applySearchFilter(event.getSource().getValue());
-  }
-
-  private _initViewSettingsDialog(): void {
-    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
-      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
-        const sortItem = event.getParameter("sortItem");
-        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
-      }
-    });
-
-    // init sorting (with simple sorters as custom data for all fields)
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "EmployeeID",
-      text: "Employee ID",
-      selected: true // by default the MockData is sorted by EmployeeID
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "FirstName",
-      text: "First Name",
-      selected: false
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "LastName",
-      text: "Last Name",
-      selected: false
-    }));
-  }
-
-  private _applySearchFilter(searchQuery: string): void {
-    // first check if we already have this search value
-    if (this.searchQuery === searchQuery) {
-      return;
-    }
-    this.searchQuery = searchQuery;
-    (<SearchField> this.byId("searchField")).setValue(searchQuery);
-
-    let filter: Filter | null = null;
-
-    // add filters for search
-    if (searchQuery?.length > 0) {
-      const filters: Filter[] = [];
-
-      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
-      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
-      filter = new Filter({ filters: filters, and: false }); // OR filter
-    }
-
-    // update list binding
-    const binding = (<ListBinding> this.table.getBinding("items"));
-    binding.filter(filter, "Application");
-  }
-
-  /**
-   * Applies sorting on our table control.
-   * @param {string} fieldName the name of the field used for sorting
-   * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
-   * @private
-   */
-  private _applySorter(fieldName: string, sortDescending: string | boolean): void {
-    // only continue if we have a valid sort field
-    if (fieldName && this.validSortFields.includes(fieldName)) {
-      let descending: boolean;
-
-      // convert the sort order to a boolean value
-      if (typeof sortDescending === "string") {
-        descending = sortDescending === "true";
-      } else if (typeof sortDescending === "boolean") {
-        descending = sortDescending;
-      } else {
-        descending = false;
-      }
-
-      // sort only if the sorter has changed
-      if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
-        return;
-      }
-
-      this.sortField = fieldName;
-      this.sortDescending = descending;
-      const sorter = new Sorter(fieldName, descending);
-
-      // sync with View Settings Dialog
-      this._syncViewSettingsDialogSorter(fieldName, descending);
-
-      const binding = (<ListBinding> this.table.getBinding("items"));
-      binding.sort(sorter);
-    }
-  }
-
-  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
-    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
-    // Note: no input validation is implemented here
-    this.viewSettingsDialog.setSelectedSortItem(sortField);
-    this.viewSettingsDialog.setSortDescending(sortDescending);
-  }
-}
+import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
+import Table from "sap/m/Table";
+import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent } from "sap/m/ViewSettingsDialog";
+import ViewSettingsItem from "sap/m/ViewSettingsItem";
+import BaseController from "ui5/tutorial/navigation/controller/BaseController";
+import Filter from "sap/ui/model/Filter";
+import FilterOperator from "sap/ui/model/FilterOperator";
+import ListBinding from "sap/ui/model/ListBinding";
+import Sorter from "sap/ui/model/Sorter";
+
+/**
+ * @namespace ui5.tutorial.navigation.controller.employee.overview
+ */
+export default class EmployeeOverviewContent extends BaseController {
+
+  private table: Table;
+  private viewSettingsDialog: ViewSettingsDialog;
+  private sortField: string | null = null;
+  private sortDescending: boolean = false;
+  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
+  private searchQuery: string | null = null;
+
+  public onInit(): void {
+    this.table = (<Table> this.byId("employeesTable"));
+    this._initViewSettingsDialog();
+  }
+
+  public onSortButtonPressed(): void {
+    this.viewSettingsDialog.open();
+  }
+
+  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
+    this._applySearchFilter(event.getSource().getValue());
+  }
+
+  private _initViewSettingsDialog(): void {
+    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
+      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
+        const sortItem = event.getParameter("sortItem");
+        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
+      }
+    });
+
+    // init sorting (with simple sorters as custom data for all fields)
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "EmployeeID",
+      text: "Employee ID",
+      selected: true // by default the MockData is sorted by EmployeeID
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "FirstName",
+      text: "First Name",
+      selected: false
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "LastName",
+      text: "Last Name",
+      selected: false
+    }));
+  }
+
+  private _applySearchFilter(searchQuery: string): void {
+    // first check if we already have this search value
+    if (this.searchQuery === searchQuery) {
+      return;
+    }
+    this.searchQuery = searchQuery;
+    (<SearchField> this.byId("searchField")).setValue(searchQuery);
+
+    let filter: Filter | null = null;
+
+    // add filters for search
+    if (searchQuery?.length > 0) {
+      const filters: Filter[] = [];
+
+      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
+      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
+      filter = new Filter({ filters: filters, and: false }); // OR filter
+    }
+
+    // update list binding
+    const binding = (<ListBinding> this.table.getBinding("items"));
+    binding.filter(filter, "Application");
+  }
+
+  /**
+   * Applies sorting on our table control.
+   * @param {string} fieldName the name of the field used for sorting
+   * @param {boolean} sortDescending whether to sort descending
+   * @private
+   */
+  private _applySorter(fieldName: string, sortDescending: boolean): void {
+    // only continue if we have a valid sort field
+    if (fieldName && this.validSortFields.includes(fieldName)) {
+      // sort only if the sorter has changed
+      if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
+        return;
+      }
+
+      this.sortField = fieldName;
+      this.sortDescending = sortDescending;
+      const sorter = new Sorter(fieldName, sortDescending);
+
+      // sync with View Settings Dialog
+      this._syncViewSettingsDialogSorter(fieldName, sortDescending);
+
+      const binding = (<ListBinding> this.table.getBinding("items"));
+      binding.sort(sorter);
+    }
+  }
+
+  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
+    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
+    // Note: no input validation is implemented here
+    this.viewSettingsDialog.setSelectedSortItem(sortField);
+    this.viewSettingsDialog.setSortDescending(sortDescending);
+  }
+}
diff --git a/packages/navigation/steps/11/webapp/index-cdn.html b/packages/navigation/steps/11/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/11/webapp/index-cdn.html
+++ b/packages/navigation/steps/11/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/11/webapp/manifest.json b/packages/navigation/steps/11/webapp/manifest.json
index 98a3dc0f0..e74a9c107 100644
--- a/packages/navigation/steps/11/webapp/manifest.json
+++ b/packages/navigation/steps/11/webapp/manifest.json
@@ -48,7 +48,8 @@
       "minUI5Version": "1.148",
       "libs": {
         "sap.m": {},
-        "sap.ui.core": {}
+        "sap.ui.core": {},
+        "sap.ui.layout": {}
       }
     },
     "models": {
diff --git a/packages/navigation/steps/12/README.md b/packages/navigation/steps/12/README.md
index f86358cf3..2918745fa 100644
--- a/packages/navigation/steps/12/README.md
+++ b/packages/navigation/steps/12/README.md
@@ -226,33 +226,22 @@ sap.ui.define(["sap/m/ViewSettingsDialog", "sap/m/ViewSettingsItem", "ui5/tutori
 		/**
 		 * Applies sorting on our table control.
 		 * @param {string} fieldName the name of the field used for sorting
-		 * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
+		 * @param {boolean} sortDescending whether to sort descending
 		 * @private
 		 */
 		_applySorter(fieldName, sortDescending) {
 			// only continue if we have a valid sort field
 			if (fieldName && this.validSortFields.includes(fieldName)) {
-				let descending;
-
-				// convert the sort order to a boolean value
-				if (typeof sortDescending === "string") {
-					descending = sortDescending === "true";
-				} else if (typeof sortDescending === "boolean") {
-					descending = sortDescending;
-				} else {
-					descending = false;
-				}
-
 				// sort only if the sorter has changed
-				if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
+				if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
 					return;
 				}
 				this.sortField = fieldName;
-				this.sortDescending = descending;
-				const sorter = new Sorter(fieldName, descending);
+				this.sortDescending = sortDescending;
+				const sorter = new Sorter(fieldName, sortDescending);
 
 				// sync with View Settings Dialog
-				this._syncViewSettingsDialogSorter(fieldName, descending);
+				this._syncViewSettingsDialogSorter(fieldName, sortDescending);
 				const binding = this.table.getBinding("items");
 				binding.sort(sorter);
 			}
diff --git a/packages/navigation/steps/12/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts b/packages/navigation/steps/12/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
index 8c5fc7ff7..818cf3cd5 100644
--- a/packages/navigation/steps/12/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
+++ b/packages/navigation/steps/12/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
@@ -1,152 +1,141 @@
-import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
-import Table from "sap/m/Table";
-import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent } from "sap/m/ViewSettingsDialog";
-import ViewSettingsItem from "sap/m/ViewSettingsItem";
-import BaseController from "ui5/tutorial/navigation/controller/BaseController";
-import Filter from "sap/ui/model/Filter";
-import FilterOperator from "sap/ui/model/FilterOperator";
-import ListBinding from "sap/ui/model/ListBinding";
-import Sorter from "sap/ui/model/Sorter";
-import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
-
-/**
- * @namespace ui5.tutorial.navigation.controller.employee.overview
- */
-export default class EmployeeOverviewContent extends BaseController {
-
-  private table: Table;
-  private viewSettingsDialog: ViewSettingsDialog;
-  private sortField: string | null = null;
-  private sortDescending: boolean = false;
-  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
-  private searchQuery: string | null = null;
-  private routerArgs: any = null;
-
-  public onInit(): void {
-    const router = this.getRouter();
-
-    this.table = (<Table> this.byId("employeesTable"));
-    this._initViewSettingsDialog();
-
-    // make the search bookmarkable
-    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
-  }
-
-  private _onRouteMatched(event: Route$MatchedEvent): void {
-    // save the current query state
-    this.routerArgs = event.getParameter("arguments");
-    this.routerArgs["?query"] ||= {};
-
-    // search/filter via URL hash
-    this._applySearchFilter(this.routerArgs["?query"].search);
-  }
-
-  public onSortButtonPressed(): void {
-    this.viewSettingsDialog.open();
-  }
-
-  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
-    const router = this.getRouter();
-
-    // update the hash with the current search term
-    this.routerArgs["?query"].search = event.getSource().getValue();
-    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
-  }
-
-  private _initViewSettingsDialog(): void {
-    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
-      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
-        const sortItem = event.getParameter("sortItem");
-
-        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
-      }
-    });
-
-    // init sorting (with simple sorters as custom data for all fields)
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "EmployeeID",
-      text: "Employee ID",
-      selected: true // by default the MockData is sorted by EmployeeID
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "FirstName",
-      text: "First Name",
-      selected: false
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "LastName",
-      text: "Last Name",
-      selected: false
-    }));
-  }
-
-  private _applySearchFilter(searchQuery: string): void {
-    // first check if we already have this search value
-    if (this.searchQuery === searchQuery) {
-      return;
-    }
-    this.searchQuery = searchQuery;
-    (<SearchField> this.byId("searchField")).setValue(searchQuery);
-
-    let filter: Filter | null = null;
-
-    // add filters for search
-    if (searchQuery?.length > 0) {
-      const filters: Filter[] = [];
-
-      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
-      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
-      filter = new Filter({ filters: filters, and: false }); // OR filter
-    }
-
-    // update list binding
-    const binding = (<ListBinding> this.table.getBinding("items"));
-    binding.filter(filter, "Application");
-  }
-
-  /**
-   * Applies sorting on our table control.
-   * @param {string} fieldName the name of the field used for sorting
-   * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
-   * @private
-   */
-  private _applySorter(fieldName: string, sortDescending: string | boolean): void {
-    // only continue if we have a valid sort field
-    if (fieldName && this.validSortFields.includes(fieldName)) {
-      let descending: boolean;
-
-      // convert the sort order to a boolean value
-      if (typeof sortDescending === "string") {
-        descending = sortDescending === "true";
-      } else if (typeof sortDescending === "boolean") {
-        descending = sortDescending;
-      } else {
-        descending = false;
-      }
-
-      // sort only if the sorter has changed
-      if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
-        return;
-      }
-
-      this.sortField = fieldName;
-      this.sortDescending = descending;
-      const sorter = new Sorter(fieldName, descending);
-
-      // sync with View Settings Dialog
-      this._syncViewSettingsDialogSorter(fieldName, descending);
-
-      const binding = (<ListBinding> this.table.getBinding("items"));
-      binding.sort(sorter);
-    }
-  }
-
-  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
-    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
-    // Note: no input validation is implemented here
-    this.viewSettingsDialog.setSelectedSortItem(sortField);
-    this.viewSettingsDialog.setSortDescending(sortDescending);
-  }
-}
+import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
+import Table from "sap/m/Table";
+import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent } from "sap/m/ViewSettingsDialog";
+import ViewSettingsItem from "sap/m/ViewSettingsItem";
+import BaseController from "ui5/tutorial/navigation/controller/BaseController";
+import Filter from "sap/ui/model/Filter";
+import FilterOperator from "sap/ui/model/FilterOperator";
+import ListBinding from "sap/ui/model/ListBinding";
+import Sorter from "sap/ui/model/Sorter";
+import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
+
+/**
+ * @namespace ui5.tutorial.navigation.controller.employee.overview
+ */
+export default class EmployeeOverviewContent extends BaseController {
+
+  private table: Table;
+  private viewSettingsDialog: ViewSettingsDialog;
+  private sortField: string | null = null;
+  private sortDescending: boolean = false;
+  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
+  private searchQuery: string | null = null;
+  private routerArgs: any = null;
+
+  public onInit(): void {
+    const router = this.getRouter();
+
+    this.table = (<Table> this.byId("employeesTable"));
+    this._initViewSettingsDialog();
+
+    // make the search bookmarkable
+    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
+  }
+
+  private _onRouteMatched(event: Route$MatchedEvent): void {
+    // save the current query state
+    this.routerArgs = event.getParameter("arguments");
+    this.routerArgs["?query"] ||= {};
+
+    // search/filter via URL hash
+    this._applySearchFilter(this.routerArgs["?query"].search);
+  }
+
+  public onSortButtonPressed(): void {
+    this.viewSettingsDialog.open();
+  }
+
+  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
+    const router = this.getRouter();
+
+    // update the hash with the current search term
+    this.routerArgs["?query"].search = event.getSource().getValue();
+    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
+  }
+
+  private _initViewSettingsDialog(): void {
+    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
+      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
+        const sortItem = event.getParameter("sortItem");
+
+        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
+      }
+    });
+
+    // init sorting (with simple sorters as custom data for all fields)
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "EmployeeID",
+      text: "Employee ID",
+      selected: true // by default the MockData is sorted by EmployeeID
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "FirstName",
+      text: "First Name",
+      selected: false
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "LastName",
+      text: "Last Name",
+      selected: false
+    }));
+  }
+
+  private _applySearchFilter(searchQuery: string): void {
+    // first check if we already have this search value
+    if (this.searchQuery === searchQuery) {
+      return;
+    }
+    this.searchQuery = searchQuery;
+    (<SearchField> this.byId("searchField")).setValue(searchQuery);
+
+    let filter: Filter | null = null;
+
+    // add filters for search
+    if (searchQuery?.length > 0) {
+      const filters: Filter[] = [];
+
+      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
+      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
+      filter = new Filter({ filters: filters, and: false }); // OR filter
+    }
+
+    // update list binding
+    const binding = (<ListBinding> this.table.getBinding("items"));
+    binding.filter(filter, "Application");
+  }
+
+  /**
+   * Applies sorting on our table control.
+   * @param {string} fieldName the name of the field used for sorting
+   * @param {boolean} sortDescending whether to sort descending
+   * @private
+   */
+  private _applySorter(fieldName: string, sortDescending: boolean): void {
+    // only continue if we have a valid sort field
+    if (fieldName && this.validSortFields.includes(fieldName)) {
+      // sort only if the sorter has changed
+      if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
+        return;
+      }
+
+      this.sortField = fieldName;
+      this.sortDescending = sortDescending;
+      const sorter = new Sorter(fieldName, sortDescending);
+
+      // sync with View Settings Dialog
+      this._syncViewSettingsDialogSorter(fieldName, sortDescending);
+
+      const binding = (<ListBinding> this.table.getBinding("items"));
+      binding.sort(sorter);
+    }
+  }
+
+  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
+    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
+    // Note: no input validation is implemented here
+    this.viewSettingsDialog.setSelectedSortItem(sortField);
+    this.viewSettingsDialog.setSortDescending(sortDescending);
+  }
+}
diff --git a/packages/navigation/steps/12/webapp/index-cdn.html b/packages/navigation/steps/12/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/12/webapp/index-cdn.html
+++ b/packages/navigation/steps/12/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/12/webapp/manifest.json b/packages/navigation/steps/12/webapp/manifest.json
index 587251842..3f3e467b2 100644
--- a/packages/navigation/steps/12/webapp/manifest.json
+++ b/packages/navigation/steps/12/webapp/manifest.json
@@ -48,7 +48,8 @@
       "minUI5Version": "1.148",
       "libs": {
         "sap.m": {},
-        "sap.ui.core": {}
+        "sap.ui.core": {},
+        "sap.ui.layout": {}
       }
     },
     "models": {
@@ -95,7 +96,7 @@
           "target": "employees"
         },
         {
-          "pattern": "employee/overview:?query:",
+          "pattern": "employees/overview:?query:",
           "name": "employeeOverview",
           "target": [
             "EmployeeOverviewTop",
diff --git a/packages/navigation/steps/13/README.md b/packages/navigation/steps/13/README.md
index 5fd526559..b5f49f565 100644
--- a/packages/navigation/steps/13/README.md
+++ b/packages/navigation/steps/13/README.md
@@ -166,33 +166,22 @@ sap.ui.define(["sap/m/ViewSettingsDialog", "sap/m/ViewSettingsItem", "ui5/tutori
 		/**
 		 * Applies sorting on our table control.
 		 * @param {string} fieldName the name of the field used for sorting
-		 * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
+		 * @param {boolean} sortDescending whether to sort descending
 		 * @private
 		 */
 		_applySorter(fieldName, sortDescending) {
 			// only continue if we have a valid sort field
 			if (fieldName && this.validSortFields.includes(fieldName)) {
-				let descending;
-
-				// convert the sort order to a boolean value
-				if (typeof sortDescending === "string") {
-					descending = sortDescending === "true";
-				} else if (typeof sortDescending === "boolean") {
-					descending = sortDescending;
-				} else {
-					descending = false;
-				}
-
 				// sort only if the sorter has changed
-				if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
+				if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
 					return;
 				}
 				this.sortField = fieldName;
-				this.sortDescending = descending;
-				const sorter = new Sorter(fieldName, descending);
+				this.sortDescending = sortDescending;
+				const sorter = new Sorter(fieldName, sortDescending);
 
 				// sync with View Settings Dialog
-				this._syncViewSettingsDialogSorter(fieldName, descending);
+				this._syncViewSettingsDialogSorter(fieldName, sortDescending);
 				const binding = this.table.getBinding("items");
 				binding.sort(sorter);
 			}
diff --git a/packages/navigation/steps/13/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts b/packages/navigation/steps/13/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
index 82915de8c..d1986fd74 100644
--- a/packages/navigation/steps/13/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
+++ b/packages/navigation/steps/13/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
@@ -1,161 +1,150 @@
-import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
-import Table from "sap/m/Table";
-import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent } from "sap/m/ViewSettingsDialog";
-import ViewSettingsItem from "sap/m/ViewSettingsItem";
-import BaseController from "ui5/tutorial/navigation/controller/BaseController";
-import Filter from "sap/ui/model/Filter";
-import FilterOperator from "sap/ui/model/FilterOperator";
-import ListBinding from "sap/ui/model/ListBinding";
-import Sorter from "sap/ui/model/Sorter";
-import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
-
-/**
- * @namespace ui5.tutorial.navigation.controller.employee.overview
- */
-export default class EmployeeOverviewContent extends BaseController {
-
-  private table: Table;
-  private viewSettingsDialog: ViewSettingsDialog;
-  private sortField: string | null = null;
-  private sortDescending: boolean = false;
-  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
-  private searchQuery: string | null = null;
-  private routerArgs: any = null;
-
-  public onInit(): void {
-    const router = this.getRouter();
-
-    this.table = (<Table> this.byId("employeesTable"));
-    this._initViewSettingsDialog();
-
-    // make the search bookmarkable
-    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
-  }
-
-  private _onRouteMatched(event: Route$MatchedEvent): void {
-    // save the current query state
-    this.routerArgs = event.getParameter("arguments");
-    this.routerArgs["?query"] ||= {};
-    const queryParameter = this.routerArgs["?query"];
-
-    // search/filter via URL hash
-    this._applySearchFilter(queryParameter.search);
-
-    // sorting via URL hash
-    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
-  }
-
-  public onSortButtonPressed(): void {
-    this.viewSettingsDialog.open();
-  }
-
-  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
-    const router = this.getRouter();
-
-    // update the hash with the current search term
-    this.routerArgs["?query"].search = event.getSource().getValue();
-    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
-  }
-
-  private _initViewSettingsDialog(): void {
-    const router = this.getRouter();
-
-    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
-      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
-        const sortItem = event.getParameter("sortItem");
-
-        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
-        this.routerArgs["?query"].sortField = sortItem.getKey();
-        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
-        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
-      }
-    });
-
-    // init sorting (with simple sorters as custom data for all fields)
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "EmployeeID",
-      text: "Employee ID",
-      selected: true // by default the MockData is sorted by EmployeeID
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "FirstName",
-      text: "First Name",
-      selected: false
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "LastName",
-      text: "Last Name",
-      selected: false
-    }));
-  }
-
-  private _applySearchFilter(searchQuery: string): void {
-    // first check if we already have this search value
-    if (this.searchQuery === searchQuery) {
-      return;
-    }
-    this.searchQuery = searchQuery;
-    (<SearchField> this.byId("searchField")).setValue(searchQuery);
-
-    let filter: Filter | null = null;
-
-    // add filters for search
-    if (searchQuery?.length > 0) {
-      const filters: Filter[] = [];
-
-      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
-      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
-      filter = new Filter({ filters: filters, and: false }); // OR filter
-    }
-
-    // update list binding
-    const binding = (<ListBinding> this.table.getBinding("items"));
-    binding.filter(filter, "Application");
-  }
-
-  /**
-   * Applies sorting on our table control.
-   * @param {string} fieldName the name of the field used for sorting
-   * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
-   * @private
-   */
-  private _applySorter(fieldName: string, sortDescending: string | boolean): void {
-    // only continue if we have a valid sort field
-    if (fieldName && this.validSortFields.includes(fieldName)) {
-      let descending: boolean;
-
-      // convert the sort order to a boolean value
-      if (typeof sortDescending === "string") {
-        descending = sortDescending === "true";
-      } else if (typeof sortDescending === "boolean") {
-        descending = sortDescending;
-      } else {
-        descending = false;
-      }
-
-      // sort only if the sorter has changed
-      if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
-        return;
-      }
-
-      this.sortField = fieldName;
-      this.sortDescending = descending;
-      const sorter = new Sorter(fieldName, descending);
-
-      // sync with View Settings Dialog
-      this._syncViewSettingsDialogSorter(fieldName, descending);
-
-      const binding = (<ListBinding> this.table.getBinding("items"));
-      binding.sort(sorter);
-    }
-  }
-
-  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
-    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
-    // Note: no input validation is implemented here
-    this.viewSettingsDialog.setSelectedSortItem(sortField);
-    this.viewSettingsDialog.setSortDescending(sortDescending);
-  }
-}
+import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
+import Table from "sap/m/Table";
+import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent } from "sap/m/ViewSettingsDialog";
+import ViewSettingsItem from "sap/m/ViewSettingsItem";
+import BaseController from "ui5/tutorial/navigation/controller/BaseController";
+import Filter from "sap/ui/model/Filter";
+import FilterOperator from "sap/ui/model/FilterOperator";
+import ListBinding from "sap/ui/model/ListBinding";
+import Sorter from "sap/ui/model/Sorter";
+import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
+
+/**
+ * @namespace ui5.tutorial.navigation.controller.employee.overview
+ */
+export default class EmployeeOverviewContent extends BaseController {
+
+  private table: Table;
+  private viewSettingsDialog: ViewSettingsDialog;
+  private sortField: string | null = null;
+  private sortDescending: boolean = false;
+  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
+  private searchQuery: string | null = null;
+  private routerArgs: any = null;
+
+  public onInit(): void {
+    const router = this.getRouter();
+
+    this.table = (<Table> this.byId("employeesTable"));
+    this._initViewSettingsDialog();
+
+    // make the search bookmarkable
+    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
+  }
+
+  private _onRouteMatched(event: Route$MatchedEvent): void {
+    // save the current query state
+    this.routerArgs = event.getParameter("arguments");
+    this.routerArgs["?query"] ||= {};
+    const queryParameter = this.routerArgs["?query"];
+
+    // search/filter via URL hash
+    this._applySearchFilter(queryParameter.search);
+
+    // sorting via URL hash
+    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
+  }
+
+  public onSortButtonPressed(): void {
+    this.viewSettingsDialog.open();
+  }
+
+  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
+    const router = this.getRouter();
+
+    // update the hash with the current search term
+    this.routerArgs["?query"].search = event.getSource().getValue();
+    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
+  }
+
+  private _initViewSettingsDialog(): void {
+    const router = this.getRouter();
+
+    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
+      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
+        const sortItem = event.getParameter("sortItem");
+
+        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
+        this.routerArgs["?query"].sortField = sortItem.getKey();
+        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
+        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
+      }
+    });
+
+    // init sorting (with simple sorters as custom data for all fields)
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "EmployeeID",
+      text: "Employee ID",
+      selected: true // by default the MockData is sorted by EmployeeID
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "FirstName",
+      text: "First Name",
+      selected: false
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "LastName",
+      text: "Last Name",
+      selected: false
+    }));
+  }
+
+  private _applySearchFilter(searchQuery: string): void {
+    // first check if we already have this search value
+    if (this.searchQuery === searchQuery) {
+      return;
+    }
+    this.searchQuery = searchQuery;
+    (<SearchField> this.byId("searchField")).setValue(searchQuery);
+
+    let filter: Filter | null = null;
+
+    // add filters for search
+    if (searchQuery?.length > 0) {
+      const filters: Filter[] = [];
+
+      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
+      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
+      filter = new Filter({ filters: filters, and: false }); // OR filter
+    }
+
+    // update list binding
+    const binding = (<ListBinding> this.table.getBinding("items"));
+    binding.filter(filter, "Application");
+  }
+
+  /**
+   * Applies sorting on our table control.
+   * @param {string} fieldName the name of the field used for sorting
+   * @param {boolean} sortDescending whether to sort descending
+   * @private
+   */
+  private _applySorter(fieldName: string, sortDescending: boolean): void {
+    // only continue if we have a valid sort field
+    if (fieldName && this.validSortFields.includes(fieldName)) {
+      // sort only if the sorter has changed
+      if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
+        return;
+      }
+
+      this.sortField = fieldName;
+      this.sortDescending = sortDescending;
+      const sorter = new Sorter(fieldName, sortDescending);
+
+      // sync with View Settings Dialog
+      this._syncViewSettingsDialogSorter(fieldName, sortDescending);
+
+      const binding = (<ListBinding> this.table.getBinding("items"));
+      binding.sort(sorter);
+    }
+  }
+
+  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
+    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
+    // Note: no input validation is implemented here
+    this.viewSettingsDialog.setSelectedSortItem(sortField);
+    this.viewSettingsDialog.setSortDescending(sortDescending);
+  }
+}
diff --git a/packages/navigation/steps/13/webapp/index-cdn.html b/packages/navigation/steps/13/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/13/webapp/index-cdn.html
+++ b/packages/navigation/steps/13/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/13/webapp/manifest.json b/packages/navigation/steps/13/webapp/manifest.json
index 587251842..3f3e467b2 100644
--- a/packages/navigation/steps/13/webapp/manifest.json
+++ b/packages/navigation/steps/13/webapp/manifest.json
@@ -48,7 +48,8 @@
       "minUI5Version": "1.148",
       "libs": {
         "sap.m": {},
-        "sap.ui.core": {}
+        "sap.ui.core": {},
+        "sap.ui.layout": {}
       }
     },
     "models": {
@@ -95,7 +96,7 @@
           "target": "employees"
         },
         {
-          "pattern": "employee/overview:?query:",
+          "pattern": "employees/overview:?query:",
           "name": "employeeOverview",
           "target": [
             "EmployeeOverviewTop",
diff --git a/packages/navigation/steps/14/README.md b/packages/navigation/steps/14/README.md
index 8426b8fdf..df73c8429 100644
--- a/packages/navigation/steps/14/README.md
+++ b/packages/navigation/steps/14/README.md
@@ -14,10 +14,10 @@ You can view this step live: [🔗 Live Preview of Step 14](https://ui5.github.i
 
 You can download the solution for this step here: <span class="ts-only">[📥 Download step 14](https://ui5.github.io/tutorials/navigation/navigation-step-14.zip)<span class="lang-suffix"> (TS)</span></span><span class="js-only">[📥 Download step 14](https://ui5.github.io/tutorials/navigation/navigation-step-14-js.zip)<span class="lang-suffix"> (JS)</span></span>.
 
-## /controller/employee/overview/EmployeeOverviewContent.controller.ts
+## `webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts/.js`
 
 ```ts
-// /controller/employee/overview/EmployeeOverviewContent.controller.ts
+// webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
 import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
 import Table from "sap/m/Table";
 import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent, ViewSettingsDialog$CancelEvent } from "sap/m/ViewSettingsDialog";
@@ -83,7 +83,7 @@ export default class EmployeeOverviewContent extends BaseController {
 ```
 
 ```js
-// /controller/employee/overview/EmployeeOverviewContent.controller.js
+// webapp/controller/employee/overview/EmployeeOverviewContent.controller.js
 sap.ui.define(["sap/m/ViewSettingsDialog", "sap/m/ViewSettingsItem", "ui5/tutorial/navigation/controller/BaseController", "sap/ui/model/Filter", "sap/ui/model/FilterOperator", "sap/ui/model/Sorter"], function (ViewSettingsDialog, ViewSettingsItem, BaseController, Filter, FilterOperator, Sorter) {
 	"use strict";
 
@@ -194,33 +194,22 @@ sap.ui.define(["sap/m/ViewSettingsDialog", "sap/m/ViewSettingsItem", "ui5/tutori
 		/**
 		 * Applies sorting on our table control.
 		 * @param {string} fieldName the name of the field used for sorting
-		 * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
+		 * @param {boolean} sortDescending whether to sort descending
 		 * @private
 		 */
 		_applySorter(fieldName, sortDescending) {
 			// only continue if we have a valid sort field
 			if (fieldName && this.validSortFields.includes(fieldName)) {
-				let descending;
-
-				// convert the sort order to a boolean value
-				if (typeof sortDescending === "string") {
-					descending = sortDescending === "true";
-				} else if (typeof sortDescending === "boolean") {
-					descending = sortDescending;
-				} else {
-					descending = false;
-				}
-
 				// sort only if the sorter has changed
-				if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
+				if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
 					return;
 				}
 				this.sortField = fieldName;
-				this.sortDescending = descending;
-				const sorter = new Sorter(fieldName, descending);
+				this.sortDescending = sortDescending;
+				const sorter = new Sorter(fieldName, sortDescending);
 
 				// sync with View Settings Dialog
-				this._syncViewSettingsDialogSorter(fieldName, descending);
+				this._syncViewSettingsDialogSorter(fieldName, sortDescending);
 				const binding = this.table.getBinding("items");
 				binding.sort(sorter);
 			}
diff --git a/packages/navigation/steps/14/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts b/packages/navigation/steps/14/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
index 66954bcc6..197a74d6b 100644
--- a/packages/navigation/steps/14/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
+++ b/packages/navigation/steps/14/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
@@ -1,173 +1,162 @@
-import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
-import Table from "sap/m/Table";
-import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent, ViewSettingsDialog$CancelEvent } from "sap/m/ViewSettingsDialog";
-import ViewSettingsItem from "sap/m/ViewSettingsItem";
-import BaseController from "ui5/tutorial/navigation/controller/BaseController";
-import Filter from "sap/ui/model/Filter";
-import FilterOperator from "sap/ui/model/FilterOperator";
-import ListBinding from "sap/ui/model/ListBinding";
-import Sorter from "sap/ui/model/Sorter";
-import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
-
-/**
- * @namespace ui5.tutorial.navigation.controller.employee.overview
- */
-export default class EmployeeOverviewContent extends BaseController {
-
-  private table: Table;
-  private viewSettingsDialog: ViewSettingsDialog;
-  private sortField: string | null = null;
-  private sortDescending: boolean = false;
-  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
-  private searchQuery: string | null = null;
-  private routerArgs: any = null;
-
-  public onInit(): void {
-    const router = this.getRouter();
-
-    this.table = (<Table> this.byId("employeesTable"));
-    this._initViewSettingsDialog();
-
-    // make the search bookmarkable
-    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
-  }
-
-  private _onRouteMatched(event: Route$MatchedEvent): void {
-    // save the current query state
-    this.routerArgs = event.getParameter("arguments");
-    this.routerArgs["?query"] ||= {};
-    const queryParameter = this.routerArgs["?query"];
-
-    // search/filter via URL hash
-    this._applySearchFilter(queryParameter.search);
-
-    // sorting via URL hash
-    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
-
-    // show dialog via URL hash
-    if (queryParameter.showDialog) {
-      this.viewSettingsDialog.open();
-    }
-  }
-
-  public onSortButtonPressed(): void {
-    const router = this.getRouter();
-    this.routerArgs["?query"].showDialog = 1;
-    router.navTo("employeeOverview", this.routerArgs);
-  }
-
-  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
-    const router = this.getRouter();
-
-    // update the hash with the current search term
-    this.routerArgs["?query"].search = event.getSource().getValue();
-    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
-  }
-
-  private _initViewSettingsDialog(): void {
-    const router = this.getRouter();
-
-    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
-      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
-        const sortItem = event.getParameter("sortItem");
-
-        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
-        this.routerArgs["?query"].sortField = sortItem.getKey();
-        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
-        delete this.routerArgs["?query"].showDialog;
-        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
-      },
-      cancel: (event: ViewSettingsDialog$CancelEvent) => {
-        delete this.routerArgs["?query"].showDialog;
-        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
-      }
-    });
-
-    // init sorting (with simple sorters as custom data for all fields)
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "EmployeeID",
-      text: "Employee ID",
-      selected: true // by default the MockData is sorted by EmployeeID
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "FirstName",
-      text: "First Name",
-      selected: false
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "LastName",
-      text: "Last Name",
-      selected: false
-    }));
-  }
-
-  private _applySearchFilter(searchQuery: string): void {
-    // first check if we already have this search value
-    if (this.searchQuery === searchQuery) {
-      return;
-    }
-    this.searchQuery = searchQuery;
-    (<SearchField> this.byId("searchField")).setValue(searchQuery);
-
-    let filter: Filter | null = null;
-
-    // add filters for search
-    if (searchQuery?.length > 0) {
-      const filters: Filter[] = [];
-
-      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
-      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
-      filter = new Filter({ filters: filters, and: false }); // OR filter
-    }
-
-    // update list binding
-    const binding = (<ListBinding> this.table.getBinding("items"));
-    binding.filter(filter, "Application");
-  }
-
-  /**
-   * Applies sorting on our table control.
-   * @param {string} fieldName the name of the field used for sorting
-   * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
-   * @private
-   */
-  private _applySorter(fieldName: string, sortDescending: string | boolean): void {
-    // only continue if we have a valid sort field
-    if (fieldName && this.validSortFields.includes(fieldName)) {
-      let descending: boolean;
-
-      // convert the sort order to a boolean value
-      if (typeof sortDescending === "string") {
-        descending = sortDescending === "true";
-      } else if (typeof sortDescending === "boolean") {
-        descending = sortDescending;
-      } else {
-        descending = false;
-      }
-
-      // sort only if the sorter has changed
-      if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
-        return;
-      }
-
-      this.sortField = fieldName;
-      this.sortDescending = descending;
-      const sorter = new Sorter(fieldName, descending);
-
-      // sync with View Settings Dialog
-      this._syncViewSettingsDialogSorter(fieldName, descending);
-
-      const binding = (<ListBinding> this.table.getBinding("items"));
-      binding.sort(sorter);
-    }
-  }
-
-  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
-    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
-    // Note: no input validation is implemented here
-    this.viewSettingsDialog.setSelectedSortItem(sortField);
-    this.viewSettingsDialog.setSortDescending(sortDescending);
-  }
-}
+import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
+import Table from "sap/m/Table";
+import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent, ViewSettingsDialog$CancelEvent } from "sap/m/ViewSettingsDialog";
+import ViewSettingsItem from "sap/m/ViewSettingsItem";
+import BaseController from "ui5/tutorial/navigation/controller/BaseController";
+import Filter from "sap/ui/model/Filter";
+import FilterOperator from "sap/ui/model/FilterOperator";
+import ListBinding from "sap/ui/model/ListBinding";
+import Sorter from "sap/ui/model/Sorter";
+import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
+
+/**
+ * @namespace ui5.tutorial.navigation.controller.employee.overview
+ */
+export default class EmployeeOverviewContent extends BaseController {
+
+  private table: Table;
+  private viewSettingsDialog: ViewSettingsDialog;
+  private sortField: string | null = null;
+  private sortDescending: boolean = false;
+  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
+  private searchQuery: string | null = null;
+  private routerArgs: any = null;
+
+  public onInit(): void {
+    const router = this.getRouter();
+
+    this.table = (<Table> this.byId("employeesTable"));
+    this._initViewSettingsDialog();
+
+    // make the search bookmarkable
+    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
+  }
+
+  private _onRouteMatched(event: Route$MatchedEvent): void {
+    // save the current query state
+    this.routerArgs = event.getParameter("arguments");
+    this.routerArgs["?query"] ||= {};
+    const queryParameter = this.routerArgs["?query"];
+
+    // search/filter via URL hash
+    this._applySearchFilter(queryParameter.search);
+
+    // sorting via URL hash
+    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
+
+    // show dialog via URL hash
+    if (queryParameter.showDialog) {
+      this.viewSettingsDialog.open();
+    }
+  }
+
+  public onSortButtonPressed(): void {
+    const router = this.getRouter();
+    this.routerArgs["?query"].showDialog = 1;
+    router.navTo("employeeOverview", this.routerArgs);
+  }
+
+  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
+    const router = this.getRouter();
+
+    // update the hash with the current search term
+    this.routerArgs["?query"].search = event.getSource().getValue();
+    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
+  }
+
+  private _initViewSettingsDialog(): void {
+    const router = this.getRouter();
+
+    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
+      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
+        const sortItem = event.getParameter("sortItem");
+
+        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
+        this.routerArgs["?query"].sortField = sortItem.getKey();
+        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
+        delete this.routerArgs["?query"].showDialog;
+        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
+      },
+      cancel: (event: ViewSettingsDialog$CancelEvent) => {
+        delete this.routerArgs["?query"].showDialog;
+        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
+      }
+    });
+
+    // init sorting (with simple sorters as custom data for all fields)
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "EmployeeID",
+      text: "Employee ID",
+      selected: true // by default the MockData is sorted by EmployeeID
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "FirstName",
+      text: "First Name",
+      selected: false
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "LastName",
+      text: "Last Name",
+      selected: false
+    }));
+  }
+
+  private _applySearchFilter(searchQuery: string): void {
+    // first check if we already have this search value
+    if (this.searchQuery === searchQuery) {
+      return;
+    }
+    this.searchQuery = searchQuery;
+    (<SearchField> this.byId("searchField")).setValue(searchQuery);
+
+    let filter: Filter | null = null;
+
+    // add filters for search
+    if (searchQuery?.length > 0) {
+      const filters: Filter[] = [];
+
+      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
+      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
+      filter = new Filter({ filters: filters, and: false }); // OR filter
+    }
+
+    // update list binding
+    const binding = (<ListBinding> this.table.getBinding("items"));
+    binding.filter(filter, "Application");
+  }
+
+  /**
+   * Applies sorting on our table control.
+   * @param {string} fieldName the name of the field used for sorting
+   * @param {boolean} sortDescending whether to sort descending
+   * @private
+   */
+  private _applySorter(fieldName: string, sortDescending: boolean): void {
+    // only continue if we have a valid sort field
+    if (fieldName && this.validSortFields.includes(fieldName)) {
+      // sort only if the sorter has changed
+      if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
+        return;
+      }
+
+      this.sortField = fieldName;
+      this.sortDescending = sortDescending;
+      const sorter = new Sorter(fieldName, sortDescending);
+
+      // sync with View Settings Dialog
+      this._syncViewSettingsDialogSorter(fieldName, sortDescending);
+
+      const binding = (<ListBinding> this.table.getBinding("items"));
+      binding.sort(sorter);
+    }
+  }
+
+  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
+    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
+    // Note: no input validation is implemented here
+    this.viewSettingsDialog.setSelectedSortItem(sortField);
+    this.viewSettingsDialog.setSortDescending(sortDescending);
+  }
+}
diff --git a/packages/navigation/steps/14/webapp/index-cdn.html b/packages/navigation/steps/14/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/14/webapp/index-cdn.html
+++ b/packages/navigation/steps/14/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/14/webapp/manifest.json b/packages/navigation/steps/14/webapp/manifest.json
index 587251842..3f3e467b2 100644
--- a/packages/navigation/steps/14/webapp/manifest.json
+++ b/packages/navigation/steps/14/webapp/manifest.json
@@ -48,7 +48,8 @@
       "minUI5Version": "1.148",
       "libs": {
         "sap.m": {},
-        "sap.ui.core": {}
+        "sap.ui.core": {},
+        "sap.ui.layout": {}
       }
     },
     "models": {
@@ -95,7 +96,7 @@
           "target": "employees"
         },
         {
-          "pattern": "employee/overview:?query:",
+          "pattern": "employees/overview:?query:",
           "name": "employeeOverview",
           "target": [
             "EmployeeOverviewTop",
diff --git a/packages/navigation/steps/15/README.md b/packages/navigation/steps/15/README.md
index b48d040de..f563ae72b 100644
--- a/packages/navigation/steps/15/README.md
+++ b/packages/navigation/steps/15/README.md
@@ -201,33 +201,22 @@ sap.ui.define(["sap/m/ViewSettingsDialog", "sap/m/ViewSettingsItem", "ui5/tutori
 		/**
 		 * Applies sorting on our table control.
 		 * @param {string} fieldName the name of the field used for sorting
-		 * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
+		 * @param {boolean} sortDescending whether to sort descending
 		 * @private
 		 */
 		_applySorter(fieldName, sortDescending) {
 			// only continue if we have a valid sort field
 			if (fieldName && this.validSortFields.includes(fieldName)) {
-				let descending;
-
-				// convert the sort order to a boolean value
-				if (typeof sortDescending === "string") {
-					descending = sortDescending === "true";
-				} else if (typeof sortDescending === "boolean") {
-					descending = sortDescending;
-				} else {
-					descending = false;
-				}
-
 				// sort only if the sorter has changed
-				if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
+				if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
 					return;
 				}
 				this.sortField = fieldName;
-				this.sortDescending = descending;
-				const sorter = new Sorter(fieldName, descending);
+				this.sortDescending = sortDescending;
+				const sorter = new Sorter(fieldName, sortDescending);
 
 				// sync with View Settings Dialog
-				this._syncViewSettingsDialogSorter(fieldName, descending);
+				this._syncViewSettingsDialogSorter(fieldName, sortDescending);
 				const binding = this.table.getBinding("items");
 				binding.sort(sorter);
 			}
diff --git a/packages/navigation/steps/15/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts b/packages/navigation/steps/15/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
index 7a9bbc510..94666096c 100644
--- a/packages/navigation/steps/15/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
+++ b/packages/navigation/steps/15/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
@@ -1,186 +1,175 @@
-import { ListBase$ItemPressEvent } from "sap/m/ListBase";
-import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
-import Table from "sap/m/Table";
-import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent, ViewSettingsDialog$CancelEvent } from "sap/m/ViewSettingsDialog";
-import ViewSettingsItem from "sap/m/ViewSettingsItem";
-import BaseController from "ui5/tutorial/navigation/controller/BaseController";
-import Filter from "sap/ui/model/Filter";
-import FilterOperator from "sap/ui/model/FilterOperator";
-import ListBinding from "sap/ui/model/ListBinding";
-import Sorter from "sap/ui/model/Sorter";
-import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
-
-/**
- * @namespace ui5.tutorial.navigation.controller.employee.overview
- */
-export default class EmployeeOverviewContent extends BaseController {
-
-  private table: Table;
-  private viewSettingsDialog: ViewSettingsDialog;
-  private sortField: string | null = null;
-  private sortDescending: boolean = false;
-  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
-  private searchQuery: string | null = null;
-  private routerArgs: any = null;
-
-  public onInit(): void {
-    const router = this.getRouter();
-
-    this.table = (<Table> this.byId("employeesTable"));
-    this._initViewSettingsDialog();
-
-    // make the search bookmarkable
-    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
-  }
-
-  private _onRouteMatched(event: Route$MatchedEvent): void {
-    // save the current query state
-    this.routerArgs = event.getParameter("arguments");
-    this.routerArgs["?query"] ||= {};
-    const queryParameter = this.routerArgs["?query"];
-
-    // search/filter via URL hash
-    this._applySearchFilter(queryParameter.search);
-
-    // sorting via URL hash
-    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
-
-    // show dialog via URL hash
-    if (queryParameter.showDialog) {
-      this.viewSettingsDialog.open();
-    }
-  }
-
-  public onSortButtonPressed(): void {
-    const router = this.getRouter();
-    this.routerArgs["?query"].showDialog = 1;
-    router.navTo("employeeOverview", this.routerArgs);
-  }
-
-  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
-    const router = this.getRouter();
-
-    // update the hash with the current search term
-    this.routerArgs["?query"].search = event.getSource().getValue();
-    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
-  }
-
-  public onItemPressed(event: ListBase$ItemPressEvent): void {
-    const listItem = event.getParameter("listItem");
-    const context = listItem.getBindingContext();
-
-    this.getRouter().navTo("employeeResume",{
-      employeeId : context.getProperty("EmployeeID"),
-      "?query" : {
-        tab : "Info"
-      }
-    });
-  }
-
-  private _initViewSettingsDialog(): void {
-    const router = this.getRouter();
-
-    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
-      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
-        const sortItem = event.getParameter("sortItem");
-
-        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
-        this.routerArgs["?query"].sortField = sortItem.getKey();
-        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
-        delete this.routerArgs["?query"].showDialog;
-        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
-      },
-      cancel: (event: ViewSettingsDialog$CancelEvent) => {
-        delete this.routerArgs["?query"].showDialog;
-        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
-      }
-    });
-
-    // init sorting (with simple sorters as custom data for all fields)
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "EmployeeID",
-      text: "Employee ID",
-      selected: true // by default the MockData is sorted by EmployeeID
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "FirstName",
-      text: "First Name",
-      selected: false
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "LastName",
-      text: "Last Name",
-      selected: false
-    }));
-  }
-
-  private _applySearchFilter(searchQuery: string): void {
-    // first check if we already have this search value
-    if (this.searchQuery === searchQuery) {
-      return;
-    }
-    this.searchQuery = searchQuery;
-    (<SearchField> this.byId("searchField")).setValue(searchQuery);
-
-    let filter: Filter | null = null;
-
-    // add filters for search
-    if (searchQuery?.length > 0) {
-      const filters: Filter[] = [];
-
-      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
-      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
-      filter = new Filter({ filters: filters, and: false }); // OR filter
-    }
-
-    // update list binding
-    const binding = (<ListBinding> this.table.getBinding("items"));
-    binding.filter(filter, "Application");
-  }
-
-  /**
-   * Applies sorting on our table control.
-   * @param {string} fieldName the name of the field used for sorting
-   * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
-   * @private
-   */
-  private _applySorter(fieldName: string, sortDescending: string | boolean): void {
-    // only continue if we have a valid sort field
-    if (fieldName && this.validSortFields.includes(fieldName)) {
-      let descending: boolean;
-
-      // convert the sort order to a boolean value
-      if (typeof sortDescending === "string") {
-        descending = sortDescending === "true";
-      } else if (typeof sortDescending === "boolean") {
-        descending = sortDescending;
-      } else {
-        descending = false;
-      }
-
-      // sort only if the sorter has changed
-      if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
-        return;
-      }
-
-      this.sortField = fieldName;
-      this.sortDescending = descending;
-      const sorter = new Sorter(fieldName, descending);
-
-      // sync with View Settings Dialog
-      this._syncViewSettingsDialogSorter(fieldName, descending);
-
-      const binding = (<ListBinding> this.table.getBinding("items"));
-      binding.sort(sorter);
-    }
-  }
-
-  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
-    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
-    // Note: no input validation is implemented here
-    this.viewSettingsDialog.setSelectedSortItem(sortField);
-    this.viewSettingsDialog.setSortDescending(sortDescending);
-  }
-}
+import { ListBase$ItemPressEvent } from "sap/m/ListBase";
+import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
+import Table from "sap/m/Table";
+import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent, ViewSettingsDialog$CancelEvent } from "sap/m/ViewSettingsDialog";
+import ViewSettingsItem from "sap/m/ViewSettingsItem";
+import BaseController from "ui5/tutorial/navigation/controller/BaseController";
+import Filter from "sap/ui/model/Filter";
+import FilterOperator from "sap/ui/model/FilterOperator";
+import ListBinding from "sap/ui/model/ListBinding";
+import Sorter from "sap/ui/model/Sorter";
+import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
+
+/**
+ * @namespace ui5.tutorial.navigation.controller.employee.overview
+ */
+export default class EmployeeOverviewContent extends BaseController {
+
+  private table: Table;
+  private viewSettingsDialog: ViewSettingsDialog;
+  private sortField: string | null = null;
+  private sortDescending: boolean = false;
+  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
+  private searchQuery: string | null = null;
+  private routerArgs: any = null;
+
+  public onInit(): void {
+    const router = this.getRouter();
+
+    this.table = (<Table> this.byId("employeesTable"));
+    this._initViewSettingsDialog();
+
+    // make the search bookmarkable
+    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
+  }
+
+  private _onRouteMatched(event: Route$MatchedEvent): void {
+    // save the current query state
+    this.routerArgs = event.getParameter("arguments");
+    this.routerArgs["?query"] ||= {};
+    const queryParameter = this.routerArgs["?query"];
+
+    // search/filter via URL hash
+    this._applySearchFilter(queryParameter.search);
+
+    // sorting via URL hash
+    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
+
+    // show dialog via URL hash
+    if (queryParameter.showDialog) {
+      this.viewSettingsDialog.open();
+    }
+  }
+
+  public onSortButtonPressed(): void {
+    const router = this.getRouter();
+    this.routerArgs["?query"].showDialog = 1;
+    router.navTo("employeeOverview", this.routerArgs);
+  }
+
+  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
+    const router = this.getRouter();
+
+    // update the hash with the current search term
+    this.routerArgs["?query"].search = event.getSource().getValue();
+    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
+  }
+
+  public onItemPressed(event: ListBase$ItemPressEvent): void {
+    const listItem = event.getParameter("listItem");
+    const context = listItem.getBindingContext();
+
+    this.getRouter().navTo("employeeResume",{
+      employeeId : context.getProperty("EmployeeID"),
+      "?query" : {
+        tab : "Info"
+      }
+    });
+  }
+
+  private _initViewSettingsDialog(): void {
+    const router = this.getRouter();
+
+    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
+      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
+        const sortItem = event.getParameter("sortItem");
+
+        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
+        this.routerArgs["?query"].sortField = sortItem.getKey();
+        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
+        delete this.routerArgs["?query"].showDialog;
+        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
+      },
+      cancel: (event: ViewSettingsDialog$CancelEvent) => {
+        delete this.routerArgs["?query"].showDialog;
+        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
+      }
+    });
+
+    // init sorting (with simple sorters as custom data for all fields)
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "EmployeeID",
+      text: "Employee ID",
+      selected: true // by default the MockData is sorted by EmployeeID
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "FirstName",
+      text: "First Name",
+      selected: false
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "LastName",
+      text: "Last Name",
+      selected: false
+    }));
+  }
+
+  private _applySearchFilter(searchQuery: string): void {
+    // first check if we already have this search value
+    if (this.searchQuery === searchQuery) {
+      return;
+    }
+    this.searchQuery = searchQuery;
+    (<SearchField> this.byId("searchField")).setValue(searchQuery);
+
+    let filter: Filter | null = null;
+
+    // add filters for search
+    if (searchQuery?.length > 0) {
+      const filters: Filter[] = [];
+
+      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
+      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
+      filter = new Filter({ filters: filters, and: false }); // OR filter
+    }
+
+    // update list binding
+    const binding = (<ListBinding> this.table.getBinding("items"));
+    binding.filter(filter, "Application");
+  }
+
+  /**
+   * Applies sorting on our table control.
+   * @param {string} fieldName the name of the field used for sorting
+   * @param {boolean} sortDescending whether to sort descending
+   * @private
+   */
+  private _applySorter(fieldName: string, sortDescending: boolean): void {
+    // only continue if we have a valid sort field
+    if (fieldName && this.validSortFields.includes(fieldName)) {
+      // sort only if the sorter has changed
+      if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
+        return;
+      }
+
+      this.sortField = fieldName;
+      this.sortDescending = sortDescending;
+      const sorter = new Sorter(fieldName, sortDescending);
+
+      // sync with View Settings Dialog
+      this._syncViewSettingsDialogSorter(fieldName, sortDescending);
+
+      const binding = (<ListBinding> this.table.getBinding("items"));
+      binding.sort(sorter);
+    }
+  }
+
+  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
+    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
+    // Note: no input validation is implemented here
+    this.viewSettingsDialog.setSelectedSortItem(sortField);
+    this.viewSettingsDialog.setSortDescending(sortDescending);
+  }
+}
diff --git a/packages/navigation/steps/15/webapp/index-cdn.html b/packages/navigation/steps/15/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/15/webapp/index-cdn.html
+++ b/packages/navigation/steps/15/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/15/webapp/manifest.json b/packages/navigation/steps/15/webapp/manifest.json
index 587251842..3f3e467b2 100644
--- a/packages/navigation/steps/15/webapp/manifest.json
+++ b/packages/navigation/steps/15/webapp/manifest.json
@@ -48,7 +48,8 @@
       "minUI5Version": "1.148",
       "libs": {
         "sap.m": {},
-        "sap.ui.core": {}
+        "sap.ui.core": {},
+        "sap.ui.layout": {}
       }
     },
     "models": {
@@ -95,7 +96,7 @@
           "target": "employees"
         },
         {
-          "pattern": "employee/overview:?query:",
+          "pattern": "employees/overview:?query:",
           "name": "employeeOverview",
           "target": [
             "EmployeeOverviewTop",
diff --git a/packages/navigation/steps/16/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts b/packages/navigation/steps/16/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
index 7a9bbc510..94666096c 100644
--- a/packages/navigation/steps/16/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
+++ b/packages/navigation/steps/16/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
@@ -1,186 +1,175 @@
-import { ListBase$ItemPressEvent } from "sap/m/ListBase";
-import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
-import Table from "sap/m/Table";
-import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent, ViewSettingsDialog$CancelEvent } from "sap/m/ViewSettingsDialog";
-import ViewSettingsItem from "sap/m/ViewSettingsItem";
-import BaseController from "ui5/tutorial/navigation/controller/BaseController";
-import Filter from "sap/ui/model/Filter";
-import FilterOperator from "sap/ui/model/FilterOperator";
-import ListBinding from "sap/ui/model/ListBinding";
-import Sorter from "sap/ui/model/Sorter";
-import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
-
-/**
- * @namespace ui5.tutorial.navigation.controller.employee.overview
- */
-export default class EmployeeOverviewContent extends BaseController {
-
-  private table: Table;
-  private viewSettingsDialog: ViewSettingsDialog;
-  private sortField: string | null = null;
-  private sortDescending: boolean = false;
-  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
-  private searchQuery: string | null = null;
-  private routerArgs: any = null;
-
-  public onInit(): void {
-    const router = this.getRouter();
-
-    this.table = (<Table> this.byId("employeesTable"));
-    this._initViewSettingsDialog();
-
-    // make the search bookmarkable
-    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
-  }
-
-  private _onRouteMatched(event: Route$MatchedEvent): void {
-    // save the current query state
-    this.routerArgs = event.getParameter("arguments");
-    this.routerArgs["?query"] ||= {};
-    const queryParameter = this.routerArgs["?query"];
-
-    // search/filter via URL hash
-    this._applySearchFilter(queryParameter.search);
-
-    // sorting via URL hash
-    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
-
-    // show dialog via URL hash
-    if (queryParameter.showDialog) {
-      this.viewSettingsDialog.open();
-    }
-  }
-
-  public onSortButtonPressed(): void {
-    const router = this.getRouter();
-    this.routerArgs["?query"].showDialog = 1;
-    router.navTo("employeeOverview", this.routerArgs);
-  }
-
-  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
-    const router = this.getRouter();
-
-    // update the hash with the current search term
-    this.routerArgs["?query"].search = event.getSource().getValue();
-    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
-  }
-
-  public onItemPressed(event: ListBase$ItemPressEvent): void {
-    const listItem = event.getParameter("listItem");
-    const context = listItem.getBindingContext();
-
-    this.getRouter().navTo("employeeResume",{
-      employeeId : context.getProperty("EmployeeID"),
-      "?query" : {
-        tab : "Info"
-      }
-    });
-  }
-
-  private _initViewSettingsDialog(): void {
-    const router = this.getRouter();
-
-    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
-      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
-        const sortItem = event.getParameter("sortItem");
-
-        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
-        this.routerArgs["?query"].sortField = sortItem.getKey();
-        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
-        delete this.routerArgs["?query"].showDialog;
-        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
-      },
-      cancel: (event: ViewSettingsDialog$CancelEvent) => {
-        delete this.routerArgs["?query"].showDialog;
-        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
-      }
-    });
-
-    // init sorting (with simple sorters as custom data for all fields)
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "EmployeeID",
-      text: "Employee ID",
-      selected: true // by default the MockData is sorted by EmployeeID
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "FirstName",
-      text: "First Name",
-      selected: false
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "LastName",
-      text: "Last Name",
-      selected: false
-    }));
-  }
-
-  private _applySearchFilter(searchQuery: string): void {
-    // first check if we already have this search value
-    if (this.searchQuery === searchQuery) {
-      return;
-    }
-    this.searchQuery = searchQuery;
-    (<SearchField> this.byId("searchField")).setValue(searchQuery);
-
-    let filter: Filter | null = null;
-
-    // add filters for search
-    if (searchQuery?.length > 0) {
-      const filters: Filter[] = [];
-
-      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
-      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
-      filter = new Filter({ filters: filters, and: false }); // OR filter
-    }
-
-    // update list binding
-    const binding = (<ListBinding> this.table.getBinding("items"));
-    binding.filter(filter, "Application");
-  }
-
-  /**
-   * Applies sorting on our table control.
-   * @param {string} fieldName the name of the field used for sorting
-   * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
-   * @private
-   */
-  private _applySorter(fieldName: string, sortDescending: string | boolean): void {
-    // only continue if we have a valid sort field
-    if (fieldName && this.validSortFields.includes(fieldName)) {
-      let descending: boolean;
-
-      // convert the sort order to a boolean value
-      if (typeof sortDescending === "string") {
-        descending = sortDescending === "true";
-      } else if (typeof sortDescending === "boolean") {
-        descending = sortDescending;
-      } else {
-        descending = false;
-      }
-
-      // sort only if the sorter has changed
-      if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
-        return;
-      }
-
-      this.sortField = fieldName;
-      this.sortDescending = descending;
-      const sorter = new Sorter(fieldName, descending);
-
-      // sync with View Settings Dialog
-      this._syncViewSettingsDialogSorter(fieldName, descending);
-
-      const binding = (<ListBinding> this.table.getBinding("items"));
-      binding.sort(sorter);
-    }
-  }
-
-  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
-    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
-    // Note: no input validation is implemented here
-    this.viewSettingsDialog.setSelectedSortItem(sortField);
-    this.viewSettingsDialog.setSortDescending(sortDescending);
-  }
-}
+import { ListBase$ItemPressEvent } from "sap/m/ListBase";
+import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
+import Table from "sap/m/Table";
+import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent, ViewSettingsDialog$CancelEvent } from "sap/m/ViewSettingsDialog";
+import ViewSettingsItem from "sap/m/ViewSettingsItem";
+import BaseController from "ui5/tutorial/navigation/controller/BaseController";
+import Filter from "sap/ui/model/Filter";
+import FilterOperator from "sap/ui/model/FilterOperator";
+import ListBinding from "sap/ui/model/ListBinding";
+import Sorter from "sap/ui/model/Sorter";
+import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
+
+/**
+ * @namespace ui5.tutorial.navigation.controller.employee.overview
+ */
+export default class EmployeeOverviewContent extends BaseController {
+
+  private table: Table;
+  private viewSettingsDialog: ViewSettingsDialog;
+  private sortField: string | null = null;
+  private sortDescending: boolean = false;
+  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
+  private searchQuery: string | null = null;
+  private routerArgs: any = null;
+
+  public onInit(): void {
+    const router = this.getRouter();
+
+    this.table = (<Table> this.byId("employeesTable"));
+    this._initViewSettingsDialog();
+
+    // make the search bookmarkable
+    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
+  }
+
+  private _onRouteMatched(event: Route$MatchedEvent): void {
+    // save the current query state
+    this.routerArgs = event.getParameter("arguments");
+    this.routerArgs["?query"] ||= {};
+    const queryParameter = this.routerArgs["?query"];
+
+    // search/filter via URL hash
+    this._applySearchFilter(queryParameter.search);
+
+    // sorting via URL hash
+    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
+
+    // show dialog via URL hash
+    if (queryParameter.showDialog) {
+      this.viewSettingsDialog.open();
+    }
+  }
+
+  public onSortButtonPressed(): void {
+    const router = this.getRouter();
+    this.routerArgs["?query"].showDialog = 1;
+    router.navTo("employeeOverview", this.routerArgs);
+  }
+
+  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
+    const router = this.getRouter();
+
+    // update the hash with the current search term
+    this.routerArgs["?query"].search = event.getSource().getValue();
+    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
+  }
+
+  public onItemPressed(event: ListBase$ItemPressEvent): void {
+    const listItem = event.getParameter("listItem");
+    const context = listItem.getBindingContext();
+
+    this.getRouter().navTo("employeeResume",{
+      employeeId : context.getProperty("EmployeeID"),
+      "?query" : {
+        tab : "Info"
+      }
+    });
+  }
+
+  private _initViewSettingsDialog(): void {
+    const router = this.getRouter();
+
+    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
+      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
+        const sortItem = event.getParameter("sortItem");
+
+        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
+        this.routerArgs["?query"].sortField = sortItem.getKey();
+        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
+        delete this.routerArgs["?query"].showDialog;
+        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
+      },
+      cancel: (event: ViewSettingsDialog$CancelEvent) => {
+        delete this.routerArgs["?query"].showDialog;
+        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
+      }
+    });
+
+    // init sorting (with simple sorters as custom data for all fields)
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "EmployeeID",
+      text: "Employee ID",
+      selected: true // by default the MockData is sorted by EmployeeID
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "FirstName",
+      text: "First Name",
+      selected: false
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "LastName",
+      text: "Last Name",
+      selected: false
+    }));
+  }
+
+  private _applySearchFilter(searchQuery: string): void {
+    // first check if we already have this search value
+    if (this.searchQuery === searchQuery) {
+      return;
+    }
+    this.searchQuery = searchQuery;
+    (<SearchField> this.byId("searchField")).setValue(searchQuery);
+
+    let filter: Filter | null = null;
+
+    // add filters for search
+    if (searchQuery?.length > 0) {
+      const filters: Filter[] = [];
+
+      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
+      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
+      filter = new Filter({ filters: filters, and: false }); // OR filter
+    }
+
+    // update list binding
+    const binding = (<ListBinding> this.table.getBinding("items"));
+    binding.filter(filter, "Application");
+  }
+
+  /**
+   * Applies sorting on our table control.
+   * @param {string} fieldName the name of the field used for sorting
+   * @param {boolean} sortDescending whether to sort descending
+   * @private
+   */
+  private _applySorter(fieldName: string, sortDescending: boolean): void {
+    // only continue if we have a valid sort field
+    if (fieldName && this.validSortFields.includes(fieldName)) {
+      // sort only if the sorter has changed
+      if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
+        return;
+      }
+
+      this.sortField = fieldName;
+      this.sortDescending = sortDescending;
+      const sorter = new Sorter(fieldName, sortDescending);
+
+      // sync with View Settings Dialog
+      this._syncViewSettingsDialogSorter(fieldName, sortDescending);
+
+      const binding = (<ListBinding> this.table.getBinding("items"));
+      binding.sort(sorter);
+    }
+  }
+
+  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
+    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
+    // Note: no input validation is implemented here
+    this.viewSettingsDialog.setSelectedSortItem(sortField);
+    this.viewSettingsDialog.setSortDescending(sortDescending);
+  }
+}
diff --git a/packages/navigation/steps/16/webapp/index-cdn.html b/packages/navigation/steps/16/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/16/webapp/index-cdn.html
+++ b/packages/navigation/steps/16/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/16/webapp/manifest.json b/packages/navigation/steps/16/webapp/manifest.json
index 587251842..3f3e467b2 100644
--- a/packages/navigation/steps/16/webapp/manifest.json
+++ b/packages/navigation/steps/16/webapp/manifest.json
@@ -48,7 +48,8 @@
       "minUI5Version": "1.148",
       "libs": {
         "sap.m": {},
-        "sap.ui.core": {}
+        "sap.ui.core": {},
+        "sap.ui.layout": {}
       }
     },
     "models": {
@@ -95,7 +96,7 @@
           "target": "employees"
         },
         {
-          "pattern": "employee/overview:?query:",
+          "pattern": "employees/overview:?query:",
           "name": "employeeOverview",
           "target": [
             "EmployeeOverviewTop",
diff --git a/packages/navigation/steps/17/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts b/packages/navigation/steps/17/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
index 7a9bbc510..94666096c 100644
--- a/packages/navigation/steps/17/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
+++ b/packages/navigation/steps/17/webapp/controller/employee/overview/EmployeeOverviewContent.controller.ts
@@ -1,186 +1,175 @@
-import { ListBase$ItemPressEvent } from "sap/m/ListBase";
-import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
-import Table from "sap/m/Table";
-import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent, ViewSettingsDialog$CancelEvent } from "sap/m/ViewSettingsDialog";
-import ViewSettingsItem from "sap/m/ViewSettingsItem";
-import BaseController from "ui5/tutorial/navigation/controller/BaseController";
-import Filter from "sap/ui/model/Filter";
-import FilterOperator from "sap/ui/model/FilterOperator";
-import ListBinding from "sap/ui/model/ListBinding";
-import Sorter from "sap/ui/model/Sorter";
-import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
-
-/**
- * @namespace ui5.tutorial.navigation.controller.employee.overview
- */
-export default class EmployeeOverviewContent extends BaseController {
-
-  private table: Table;
-  private viewSettingsDialog: ViewSettingsDialog;
-  private sortField: string | null = null;
-  private sortDescending: boolean = false;
-  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
-  private searchQuery: string | null = null;
-  private routerArgs: any = null;
-
-  public onInit(): void {
-    const router = this.getRouter();
-
-    this.table = (<Table> this.byId("employeesTable"));
-    this._initViewSettingsDialog();
-
-    // make the search bookmarkable
-    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
-  }
-
-  private _onRouteMatched(event: Route$MatchedEvent): void {
-    // save the current query state
-    this.routerArgs = event.getParameter("arguments");
-    this.routerArgs["?query"] ||= {};
-    const queryParameter = this.routerArgs["?query"];
-
-    // search/filter via URL hash
-    this._applySearchFilter(queryParameter.search);
-
-    // sorting via URL hash
-    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
-
-    // show dialog via URL hash
-    if (queryParameter.showDialog) {
-      this.viewSettingsDialog.open();
-    }
-  }
-
-  public onSortButtonPressed(): void {
-    const router = this.getRouter();
-    this.routerArgs["?query"].showDialog = 1;
-    router.navTo("employeeOverview", this.routerArgs);
-  }
-
-  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
-    const router = this.getRouter();
-
-    // update the hash with the current search term
-    this.routerArgs["?query"].search = event.getSource().getValue();
-    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
-  }
-
-  public onItemPressed(event: ListBase$ItemPressEvent): void {
-    const listItem = event.getParameter("listItem");
-    const context = listItem.getBindingContext();
-
-    this.getRouter().navTo("employeeResume",{
-      employeeId : context.getProperty("EmployeeID"),
-      "?query" : {
-        tab : "Info"
-      }
-    });
-  }
-
-  private _initViewSettingsDialog(): void {
-    const router = this.getRouter();
-
-    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
-      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
-        const sortItem = event.getParameter("sortItem");
-
-        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
-        this.routerArgs["?query"].sortField = sortItem.getKey();
-        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
-        delete this.routerArgs["?query"].showDialog;
-        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
-      },
-      cancel: (event: ViewSettingsDialog$CancelEvent) => {
-        delete this.routerArgs["?query"].showDialog;
-        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
-      }
-    });
-
-    // init sorting (with simple sorters as custom data for all fields)
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "EmployeeID",
-      text: "Employee ID",
-      selected: true // by default the MockData is sorted by EmployeeID
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "FirstName",
-      text: "First Name",
-      selected: false
-    }));
-
-    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
-      key: "LastName",
-      text: "Last Name",
-      selected: false
-    }));
-  }
-
-  private _applySearchFilter(searchQuery: string): void {
-    // first check if we already have this search value
-    if (this.searchQuery === searchQuery) {
-      return;
-    }
-    this.searchQuery = searchQuery;
-    (<SearchField> this.byId("searchField")).setValue(searchQuery);
-
-    let filter: Filter | null = null;
-
-    // add filters for search
-    if (searchQuery?.length > 0) {
-      const filters: Filter[] = [];
-
-      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
-      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
-      filter = new Filter({ filters: filters, and: false }); // OR filter
-    }
-
-    // update list binding
-    const binding = (<ListBinding> this.table.getBinding("items"));
-    binding.filter(filter, "Application");
-  }
-
-  /**
-   * Applies sorting on our table control.
-   * @param {string} fieldName the name of the field used for sorting
-   * @param {string | boolean} sortDescending true or false as a string or boolean value to specify a descending sorting
-   * @private
-   */
-  private _applySorter(fieldName: string, sortDescending: string | boolean): void {
-    // only continue if we have a valid sort field
-    if (fieldName && this.validSortFields.includes(fieldName)) {
-      let descending: boolean;
-
-      // convert the sort order to a boolean value
-      if (typeof sortDescending === "string") {
-        descending = sortDescending === "true";
-      } else if (typeof sortDescending === "boolean") {
-        descending = sortDescending;
-      } else {
-        descending = false;
-      }
-
-      // sort only if the sorter has changed
-      if (this.sortField && this.sortField === fieldName && this.sortDescending === descending) {
-        return;
-      }
-
-      this.sortField = fieldName;
-      this.sortDescending = descending;
-      const sorter = new Sorter(fieldName, descending);
-
-      // sync with View Settings Dialog
-      this._syncViewSettingsDialogSorter(fieldName, descending);
-
-      const binding = (<ListBinding> this.table.getBinding("items"));
-      binding.sort(sorter);
-    }
-  }
-
-  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
-    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
-    // Note: no input validation is implemented here
-    this.viewSettingsDialog.setSelectedSortItem(sortField);
-    this.viewSettingsDialog.setSortDescending(sortDescending);
-  }
-}
+import { ListBase$ItemPressEvent } from "sap/m/ListBase";
+import SearchField, { SearchField$SearchEvent } from "sap/m/SearchField";
+import Table from "sap/m/Table";
+import ViewSettingsDialog, { ViewSettingsDialog$ConfirmEvent, ViewSettingsDialog$CancelEvent } from "sap/m/ViewSettingsDialog";
+import ViewSettingsItem from "sap/m/ViewSettingsItem";
+import BaseController from "ui5/tutorial/navigation/controller/BaseController";
+import Filter from "sap/ui/model/Filter";
+import FilterOperator from "sap/ui/model/FilterOperator";
+import ListBinding from "sap/ui/model/ListBinding";
+import Sorter from "sap/ui/model/Sorter";
+import { Route$MatchedEvent } from "sap/ui/core/routing/Route";
+
+/**
+ * @namespace ui5.tutorial.navigation.controller.employee.overview
+ */
+export default class EmployeeOverviewContent extends BaseController {
+
+  private table: Table;
+  private viewSettingsDialog: ViewSettingsDialog;
+  private sortField: string | null = null;
+  private sortDescending: boolean = false;
+  private validSortFields: string[] = ["EmployeeID", "FirstName", "LastName"];
+  private searchQuery: string | null = null;
+  private routerArgs: any = null;
+
+  public onInit(): void {
+    const router = this.getRouter();
+
+    this.table = (<Table> this.byId("employeesTable"));
+    this._initViewSettingsDialog();
+
+    // make the search bookmarkable
+    router.getRoute("employeeOverview").attachMatched(this._onRouteMatched, this);
+  }
+
+  private _onRouteMatched(event: Route$MatchedEvent): void {
+    // save the current query state
+    this.routerArgs = event.getParameter("arguments");
+    this.routerArgs["?query"] ||= {};
+    const queryParameter = this.routerArgs["?query"];
+
+    // search/filter via URL hash
+    this._applySearchFilter(queryParameter.search);
+
+    // sorting via URL hash
+    this._applySorter(queryParameter.sortField, queryParameter.sortDescending);
+
+    // show dialog via URL hash
+    if (queryParameter.showDialog) {
+      this.viewSettingsDialog.open();
+    }
+  }
+
+  public onSortButtonPressed(): void {
+    const router = this.getRouter();
+    this.routerArgs["?query"].showDialog = 1;
+    router.navTo("employeeOverview", this.routerArgs);
+  }
+
+  public onSearchEmployeesTable(event: SearchField$SearchEvent): void {
+    const router = this.getRouter();
+
+    // update the hash with the current search term
+    this.routerArgs["?query"].search = event.getSource().getValue();
+    router.navTo("employeeOverview", this.routerArgs, true /*no history*/);
+  }
+
+  public onItemPressed(event: ListBase$ItemPressEvent): void {
+    const listItem = event.getParameter("listItem");
+    const context = listItem.getBindingContext();
+
+    this.getRouter().navTo("employeeResume",{
+      employeeId : context.getProperty("EmployeeID"),
+      "?query" : {
+        tab : "Info"
+      }
+    });
+  }
+
+  private _initViewSettingsDialog(): void {
+    const router = this.getRouter();
+
+    this.viewSettingsDialog = new ViewSettingsDialog("vsd", {
+      confirm: (event: ViewSettingsDialog$ConfirmEvent) => {
+        const sortItem = event.getParameter("sortItem");
+
+        this._applySorter(sortItem.getKey(), event.getParameter("sortDescending"));
+        this.routerArgs["?query"].sortField = sortItem.getKey();
+        this.routerArgs["?query"].sortDescending = event.getParameter("sortDescending");
+        delete this.routerArgs["?query"].showDialog;
+        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
+      },
+      cancel: (event: ViewSettingsDialog$CancelEvent) => {
+        delete this.routerArgs["?query"].showDialog;
+        router.navTo("employeeOverview", this.routerArgs, true /*without history*/);
+      }
+    });
+
+    // init sorting (with simple sorters as custom data for all fields)
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "EmployeeID",
+      text: "Employee ID",
+      selected: true // by default the MockData is sorted by EmployeeID
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "FirstName",
+      text: "First Name",
+      selected: false
+    }));
+
+    this.viewSettingsDialog.addSortItem(new ViewSettingsItem({
+      key: "LastName",
+      text: "Last Name",
+      selected: false
+    }));
+  }
+
+  private _applySearchFilter(searchQuery: string): void {
+    // first check if we already have this search value
+    if (this.searchQuery === searchQuery) {
+      return;
+    }
+    this.searchQuery = searchQuery;
+    (<SearchField> this.byId("searchField")).setValue(searchQuery);
+
+    let filter: Filter | null = null;
+
+    // add filters for search
+    if (searchQuery?.length > 0) {
+      const filters: Filter[] = [];
+
+      filters.push(new Filter("FirstName", FilterOperator.Contains, searchQuery));
+      filters.push(new Filter("LastName", FilterOperator.Contains, searchQuery));
+      filter = new Filter({ filters: filters, and: false }); // OR filter
+    }
+
+    // update list binding
+    const binding = (<ListBinding> this.table.getBinding("items"));
+    binding.filter(filter, "Application");
+  }
+
+  /**
+   * Applies sorting on our table control.
+   * @param {string} fieldName the name of the field used for sorting
+   * @param {boolean} sortDescending whether to sort descending
+   * @private
+   */
+  private _applySorter(fieldName: string, sortDescending: boolean): void {
+    // only continue if we have a valid sort field
+    if (fieldName && this.validSortFields.includes(fieldName)) {
+      // sort only if the sorter has changed
+      if (this.sortField && this.sortField === fieldName && this.sortDescending === sortDescending) {
+        return;
+      }
+
+      this.sortField = fieldName;
+      this.sortDescending = sortDescending;
+      const sorter = new Sorter(fieldName, sortDescending);
+
+      // sync with View Settings Dialog
+      this._syncViewSettingsDialogSorter(fieldName, sortDescending);
+
+      const binding = (<ListBinding> this.table.getBinding("items"));
+      binding.sort(sorter);
+    }
+  }
+
+  private _syncViewSettingsDialogSorter(sortField: string, sortDescending: boolean): void {
+    // the possible keys are: "EmployeeID" | "FirstName" | "LastName"
+    // Note: no input validation is implemented here
+    this.viewSettingsDialog.setSelectedSortItem(sortField);
+    this.viewSettingsDialog.setSortDescending(sortDescending);
+  }
+}
diff --git a/packages/navigation/steps/17/webapp/index-cdn.html b/packages/navigation/steps/17/webapp/index-cdn.html
index f012c70af..4740608ec 100644
--- a/packages/navigation/steps/17/webapp/index-cdn.html
+++ b/packages/navigation/steps/17/webapp/index-cdn.html
@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Navigation and Routing Tutorial</title>
 		<script id="sap-ui-bootstrap"
-			src="https://sdk.openui5.org/1.148.1/resources/sap-ui-core.js"
+			src="https://sdk.openui5.org/1.148.5/resources/sap-ui-core.js"
 			data-sap-ui-resource-roots='{
 				"ui5.tutorial.navigation": "./"
 			}'
diff --git a/packages/navigation/steps/17/webapp/manifest.json b/packages/navigation/steps/17/webapp/manifest.json
index 587251842..3f3e467b2 100644
--- a/packages/navigation/steps/17/webapp/manifest.json
+++ b/packages/navigation/steps/17/webapp/manifest.json
@@ -48,7 +48,8 @@
       "minUI5Version": "1.148",
       "libs": {
         "sap.m": {},
-        "sap.ui.core": {}
+        "sap.ui.core": {},
+        "sap.ui.layout": {}
       }
     },
     "models": {
@@ -95,7 +96,7 @@
           "target": "employees"
         },
         {
-          "pattern": "employee/overview:?query:",
+          "pattern": "employees/overview:?query:",
           "name": "employeeOverview",
           "target": [
             "EmployeeOverviewTop",