diff --git a/webapp/controller/App.controller.js b/webapp/controller/App.controller.js
index 18dd58c0a9..882fad92d1 100644
--- a/webapp/controller/App.controller.js
+++ b/webapp/controller/App.controller.js
@@ -5,7 +5,10 @@ sap.ui.define([
 	"sap/base/strings/formatMessage",
 	"sap/ui/core/BarColor",
 	"sap/ui/demo/todo/util/Helper",
-], (Controller, Filter, FilterOperator, formatMessage, BarColor, Helper) => {
+	"sap/ui/core/Element",
+	"sap/ui/Device",
+	"sap/ui/model/json/JSONModel",
+], (Controller, Filter, FilterOperator, formatMessage, BarColor, Helper, Element, Device, JSONModel) => {
 	"use strict";
 
 	return Controller.extend("sap.ui.demo.todo.controller.App", {
@@ -15,8 +18,8 @@ sap.ui.define([
 			this.aTabFilters = [];
 			this.BarColor = BarColor;
 
-			this.getView().setModel(new sap.ui.model.json.JSONModel({
-				isMobile: sap.ui.Device.browser.mobile
+			this.getView().setModel(new JSONModel({
+				isMobile: Device.browser.mobile
 			}), "view");
 		},
 
@@ -31,7 +34,7 @@ sap.ui.define([
 					enabled: "{/itemsRemovable}",
 					icon: "sap-icon://delete",
 					text: "{i18n>CLEAR_COMPLETED}",
-					tap: this.onClearCompleted.bind(this),
+					press: this.onClearCompleted.bind(this),
 				});
 
 				this.byId("toolbar").addContent(clearBtn);
@@ -151,7 +154,7 @@ sap.ui.define([
 		},
 
 		_applyListFilters() {
-			const oList = sap.ui.getCore().byId("container-todo---app--todoList");
+			const oList = Element.getElementById("container-todo---app--todoList");
 			// const oList = this.byId("todoList");
 			const oBinding = oList.getBinding("items");
 
diff --git a/webapp/index.html b/webapp/index.html
index ea2590155d..f83d23ee19 100644
--- a/webapp/index.html
+++ b/webapp/index.html
@@ -9,13 +9,12 @@
 		src="resources/sap-ui-core.js"
 		data-sap-ui-libs="sap.m"
 		data-sap-ui-xx-wait-for-theme="true"
-		data-sap-ui-bindingSyntax="complex"
 		data-sap-ui-theme="sap_platinum"
-		data-sap-ui-resourceRoots='{
+		data-sap-ui-resource-roots='{
 			"sap.ui.demo.todo": "./"
 		}'
-		data-sap-ui-onInit="module:sap/ui/core/ComponentSupport"
-		data-sap-ui-compatVersion="edge"
+		data-sap-ui-on-init="module:sap/ui/core/ComponentSupport"
+		data-sap-ui-compat-version="edge"
 		data-sap-ui-async="true">
 	</script>
 </head>
diff --git a/webapp/manifest.json b/webapp/manifest.json
index c3d04ed6bc..1bce3696a5 100644
--- a/webapp/manifest.json
+++ b/webapp/manifest.json
@@ -41,10 +41,7 @@
 				"uri": "model/todoitems.json"
 			},
 			"businessData": {
-				"dataSource": "businessData",
-				"settings": {
-					"synchronizationMode": "None"
-				}
+				"dataSource": "businessData"
 			}
 		},
 		"resources": {
@@ -52,8 +49,7 @@
 				{
 					"uri": "css/styles.css"
 				}
-			],
-			"js": []
+			]
 		}
 	}
 }
diff --git a/webapp/view/App.view.xml b/webapp/view/App.view.xml
index c201e3bb0b..4ceeb29016 100644
--- a/webapp/view/App.view.xml
+++ b/webapp/view/App.view.xml
@@ -35,7 +35,7 @@
 												<SegmentedButtonItem text="{i18n>LABEL_COMPLETED}" key="completed"/>
 											</items>
 										</SegmentedButton>
-										<Button id="clearCompleted" enabled="{/itemsRemovable}" icon="sap-icon://delete" text="{i18n>CLEAR_COMPLETED}" tap="onClearCompleted"/>
+										<Button id="clearCompleted" enabled="{/itemsRemovable}" icon="sap-icon://delete" text="{i18n>CLEAR_COMPLETED}" press=".onClearCompleted"/>
 									</OverflowToolbar>
 								</headerToolbar>
 								<infoToolbar>