@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/components/factsheet/factory/ThingInspector.js

@@ -5,9 +5,11 @@
  * @deprecated
  */
 sap.ui.define([
-    "jquery.sap.global",
+    "sap/ui/thirdparty/jquery",
     "sap/suite/ui/commons/UnifiedThingInspector",
     "sap/ui/core/format/NumberFormat",
+    "sap/ui/core/Configuration",
+    "sap/ui/core/Core",
     "sap/viz/ui5/data/FlattenedDataset",
     "sap/ui/core/Locale",
     "sap/ui/model/type/DateTime",
@@ -78,10 +80,12 @@ sap.ui.define([
     "sap/m/ActionSheet",
     "sap/ushell/ui/footerbar/JamDiscussButton",
     "sap/ushell/ui/footerbar/JamShareButton"
-], function (
-    $,
+], (
+    jQuery,
     UnifiedThingInspector,
     NumberFormat,
+    Configuration,
+    Core,
     FlattenedDataset,
     Locale,
     DateTime,
@@ -152,42 +156,46 @@ sap.ui.define([
     ActionSheet,
     JamDiscussButton,
     JamShareButton
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.URLHelper
-    var URLHelper = mobileLibrary.URLHelper;
+    const URLHelper = mobileLibrary.URLHelper;
 
     // shortcut for sap.m.PlacementType
-    var PlacementType = mobileLibrary.PlacementType;
+    const PlacementType = mobileLibrary.PlacementType;
 
     // shortcut for sap.suite.ui.commons.FacetOverviewHeight
-    var FacetOverviewHeight = commonsLibrary.FacetOverviewHeight;
+    const FacetOverviewHeight = commonsLibrary.FacetOverviewHeight;
 
     // shortcut for sap.m.DateTimeInputType
-    var DateTimeInputType = mobileLibrary.DateTimeInputType;
+    const DateTimeInputType = mobileLibrary.DateTimeInputType;
 
     // shortcut for sap.m.ListMode
-    var ListMode = mobileLibrary.ListMode;
+    const ListMode = mobileLibrary.ListMode;
 
     // shortcut for sap.m.ListSeparators
-    var ListSeparators = mobileLibrary.ListSeparators;
+    const ListSeparators = mobileLibrary.ListSeparators;
 
     // shortcut for sap.m.BackgroundDesign
-    var BackgroundDesign = mobileLibrary.BackgroundDesign;
+    const BackgroundDesign = mobileLibrary.BackgroundDesign;
 
     // shortcut for sap.m.ListType
-    var ListType = mobileLibrary.ListType;
+    const ListType = mobileLibrary.ListType;
 
     // shortcut for sap.ui.core.TextAlign
-    var TextAlign = coreLibrary.TextAlign;
-
-    var oMapping = {}, aAllFacets = [], oLinkAuthorised = {}, newJSONModels = {},
-        FACTSHEET = "displayFactSheet",
-        oLocale, oTI;
-
-    oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
-    if (sap.ui.getCore().getConfiguration().getLanguage() === "ZH") {
+    const TextAlign = coreLibrary.TextAlign;
+
+    let oMapping = {};
+    let aAllFacets = [];
+    const oLinkAuthorised = {};
+    const newJSONModels = {};
+    const FACTSHEET = "displayFactSheet";
+    let oLocale;
+    let oTI;
+
+    oLocale = Configuration.getFormatSettings().getFormatLocale();
+    if (Configuration.getLanguage() === "ZH") {
         oLocale = new Locale("zh_CN");
     }
 
@@ -196,7 +204,7 @@ sap.ui.define([
     }
 
     function toPositiveNumberWithoutDecimals (value) {
-        var result = Number(value).toFixed(0);
+        let result = Number(value).toFixed(0);
         if (isNegativeValue(value)) {
             result = Number(result) * -1;
         }
@@ -204,53 +212,94 @@ sap.ui.define([
     }
 
     function kpiValueFormatter (value, fractionDigits) {
-        var result, oRegExp, sDigits, oNumberFormatter;
+        let oNumberFormatter;
         if (!value) {
             return "";
         }
-        oRegExp = new RegExp(NumberFormat.oDefaultFloatFormat.groupingSeparator, "g");
+        const oRegExp = new RegExp(NumberFormat.oDefaultFloatFormat.groupingSeparator, "g");
         if (fractionDigits >= 0) {
             fractionDigits = parseInt(fractionDigits, 10);
             oNumberFormatter = NumberFormat.getFloatInstance({ minFractionDigits: fractionDigits, maxFractionDigits: fractionDigits }, oLocale);
         } else {
             oNumberFormatter = NumberFormat.getFloatInstance({ minFractionDigits: 0, maxFractionDigits: 99 }, oLocale);
         }
-        result = oNumberFormatter.format(value);
-        sDigits = result.replace(/[\D]/g, "");
+        const result = oNumberFormatter.format(value);
+        const sDigits = result.replace(/[\D]/g, "");
         if (sDigits && sDigits.length > 6) {
             value = value.replace(oRegExp, "");
             if (toPositiveNumberWithoutDecimals(value) < 1000) {
-                //show integer part only without a fraction part
+                // show integer part only without a fraction part
                 return NumberFormat.getIntegerInstance().format(value);
             }
             oNumberFormatter = NumberFormat.getFloatInstance({ minFractionDigits: 1, maxFractionDigits: 1, style: "short" }, oLocale);
             return oNumberFormatter.format(value);
         }
         return result;
+    }
 
+    function searchObj (obj, property) {
+        let key;
+        for (key in obj) {
+            if (obj.hasOwnProperty(key)) {
+                if (key === "__metadata") {
+                    continue;
+                } else if (key === property) {
+                    return obj[key];
+                } else if (typeof obj[key] === "object") {
+                    return searchObj(obj[key], property);
+                }
+            }
+        }
+    }
+
+    function newModelValue (sUrl) {
+        let newJSONModel = {};
+        let returnValue;
+        const iLastSlash = sUrl.lastIndexOf("/");
+        const newUrl = sUrl.slice(0, iLastSlash);
+        const newProp = sUrl.slice(iLastSlash + 1);
+        if (!newJSONModels[sUrl]) {
+            newJSONModel = new JSONModel();
+            newJSONModel.loadData(newUrl, null, false);
+            newJSONModels[sUrl] = newJSONModel.getData();
+        } else {
+            newJSONModel = newJSONModels[sUrl];
+        }
+        if (newJSONModels[sUrl] && newJSONModels[sUrl].d) {
+            if (!newJSONModels[sUrl].d[newProp]) {
+                returnValue = searchObj(newJSONModels[sUrl].d, newProp);
+            } else {
+                returnValue = newJSONModels[sUrl].d[newProp];
+            }
+        }
+        return returnValue;
     }
 
     // End workaround
     // HANA Live
     function fnChange () {
-        var oUrl = "",
-            i, j, sProperty, sPropertyValue, sPath, oModel, aUrl, aParameters, sNewValue, sPropertyName, sValueFormat;
-        sPath = this.getElementBinding().sPath.split("/")[1];
-        oModel = this.getModel();
-        aUrl = this.mBindingInfos.value.parameters;
-        aParameters = this.mBindingInfos.value.parts;
-        for (i = 0; i < aUrl.length; i += 1) {
+        let oUrl = "";
+        let sProperty;
+        let sPropertyValue;
+        let sNewValue;
+        let sPropertyName;
+        let sValueFormat;
+        const sPath = this.getElementBinding().sPath.split("/")[1];
+        const oModel = this.getModel();
+        const aUrl = this.mBindingInfos.value.parameters;
+        const aParameters = this.mBindingInfos.value.parts;
+        for (let i = 0; i < aUrl.length; ++i) {
             oUrl = oUrl + aUrl[i].string;
         }
-        for (j = 0; j < aParameters.length; j += 1) {
+        for (let j = 0; j < aParameters.length; ++j) {
             sProperty = aParameters[j].path;
-            sPropertyName = "{" + sProperty + "}";
+            sPropertyName = `{${sProperty}}`;
             sPropertyValue = oModel.oData[sPath][sProperty];
             oUrl = oUrl.replace(sPropertyName, sPropertyValue);
         }
         sNewValue = newModelValue(oUrl);
         if (typeof sNewValue === "number" && !isNaN(sNewValue)) {
-            sValueFormat = this.mBindingInfos.value.parts.filter(function (obj) {
+            sValueFormat = this.mBindingInfos.value.parts.filter((obj) => {
                 return (obj.path === sProperty);
             });
             sNewValue = kpiValueFormatter(sNewValue, sValueFormat[0].type.oFormatOptions.maxFractionDigits);
@@ -260,38 +309,37 @@ sap.ui.define([
         this.getElementBinding().detachChange(fnChange);
     }
 
-    var getTIDescription = function () {
-        var sTIDescription = "";
+    function getTIDescription () {
+        let sTIDescription = "";
         if (oTI.getName() && oTI.getDescription()) {
-            sTIDescription = oTI.getName() + ", " + oTI.getDescription();
+            sTIDescription = `${oTI.getName()}, ${oTI.getDescription()}`;
         } else if (oTI.getName() && !oTI.getDescription()) {
             sTIDescription = oTI.getName();
         } else if (!oTI.getName() && oTI.getDescription()) {
             sTIDescription = oTI.getDescription();
         }
         return sTIDescription;
-    };
+    }
 
-    var getServiceFromUri = function (sUri) {
-        var aUriParts, sService, i;
-        aUriParts = sUri.slice(1).split("/");
-        sService = "/";
-        for (i = 0; i < aUriParts.length; i += 1) {
+    function getServiceFromUri (sUri) {
+        const aUriParts = sUri.slice(1).split("/");
+        let sService = "/";
+        for (let i = 0; i < aUriParts.length; ++i) {
             if ((aUriParts[i].indexOf("(") > 0) && (aUriParts[i].indexOf("sid(") < 0)) {
                 break;
             } else {
-                sService += aUriParts[i] + "/";
+                sService += `${aUriParts[i]}/`;
             }
         }
         return sService;
-    };
+    }
 
-    var getEntitySetFromUri = function (sUri, oModel) {
-        var sEntitySet, sEntityUri, aServiceParts, sNavProperty;
-        sEntityUri = sUri.slice(oModel.sServiceUrl.length + 1);
+    function getEntitySetFromUri (sUri, oModel) {
+        let sEntitySet;
+        const sEntityUri = sUri.slice(oModel.sServiceUrl.length + 1);
         if (sEntityUri.indexOf("/") >= 0) {
-            aServiceParts = sEntityUri.split("/");
-            sNavProperty = aServiceParts[aServiceParts.length];
+            const aServiceParts = sEntityUri.split("/");
+            const sNavProperty = aServiceParts[aServiceParts.length];
             sEntitySet = aServiceParts[aServiceParts.length - 1];
             if (sEntitySet.indexOf("(") >= 0) {
                 sEntitySet = sEntitySet.slice(sEntitySet.indexOf("("));
@@ -305,88 +353,93 @@ sap.ui.define([
             sEntitySet = sEntityUri;
         }
         return sEntitySet;
-    };
-
-    var getEntityKeyFromUri = function (sUri, oModel) {
-        var sEntityUri, sKey = "", oMetadata, sEntityType;
-        sEntityUri = sUri.slice(oModel.sServiceUrl.length + 1);
-        if (sEntityUri.indexOf("(") >= 0) {
-            sKey = sEntityUri.slice(sEntityUri.indexOf("(") + 1, sEntityUri.indexOf(")"));
-            if (sKey.indexOf("=") <= 0) {
-                // There is just one key property and the shortened notation was used, get name of the key property
-                oMetadata = oModel.getServiceMetadata();
-                sEntityType = getEntityType(getEntitySetFromUri(sUri, oModel), oMetadata);
-                sKey = getKeyProperty(sEntityType, oMetadata) + "=" + sKey;
-            }
-        }
-        return sKey;
-    };
+    }
 
-    var getKeyProperty = function (sEntityType, oMetadata) {
-        var i, j, metadataSchema;
-        for (i = oMetadata.dataServices.schema.length - 1; i >= 0; i -= 1) {
+    function getKeyProperty (sEntityType, oMetadata) {
+        let metadataSchema;
+        for (let i = oMetadata.dataServices.schema.length - 1; i >= 0; --i) {
             metadataSchema = oMetadata.dataServices.schema[i];
             if (metadataSchema.namespace === sEntityType.slice(0, sEntityType.lastIndexOf("."))) {
-                for (j = 0; j < metadataSchema.entityType.length; j += 1) {
+                for (let j = 0; j < metadataSchema.entityType.length; ++j) {
                     if (metadataSchema.entityType[j].name === sEntityType.slice(sEntityType.lastIndexOf(".") + 1)) {
                         return metadataSchema.entityType[j].key.propertyRef[0].name;
                     }
                 }
             }
         }
-    };
+    }
 
-    var getEntitySetFromType = function (sEntityType, oMetadata) {
-        var i, j, metadataSchema, aEntitySets;
-        for (i = oMetadata.dataServices.schema.length - 1; i >= 0; i -= 1) {
+    function getEntityType (sEntitySet, oMetadata, bWithoutNamespace) {
+        let metadataSchema;
+        let aEntitySets;
+        let sReturn;
+        for (let i = oMetadata.dataServices.schema.length - 1; i >= 0; --i) {
             metadataSchema = oMetadata.dataServices.schema[i];
             if (metadataSchema.entityContainer) {
                 aEntitySets = metadataSchema.entityContainer[0].entitySet;
-                for (j = aEntitySets.length - 1; j >= 0; j -= 1) {
-                    if (aEntitySets[j].entityType === sEntityType) {
-                        return aEntitySets[j].name;
+                for (let j = aEntitySets.length - 1; j >= 0; --j) {
+                    if (aEntitySets[j].name === sEntitySet) {
+                        if (bWithoutNamespace) {
+                            sReturn = aEntitySets[j].entityType.slice(metadataSchema.namespace.length + 1);
+                        } else {
+                            sReturn = aEntitySets[j].entityType;
+                        }
+                        return sReturn;
                     }
                 }
             }
         }
-    };
+    }
+
+    function getEntityKeyFromUri (sUri, oModel) {
+        let sKey = "";
+        const sEntityUri = sUri.slice(oModel.sServiceUrl.length + 1);
+        if (sEntityUri.indexOf("(") >= 0) {
+            sKey = sEntityUri.slice(sEntityUri.indexOf("(") + 1, sEntityUri.indexOf(")"));
+            if (sKey.indexOf("=") <= 0) {
+                // There is just one key property and the shortened notation was used, get name of the key property
+                const oMetadata = oModel.getServiceMetadata();
+                const sEntityType = getEntityType(getEntitySetFromUri(sUri, oModel), oMetadata);
+                sKey = `${getKeyProperty(sEntityType, oMetadata)}=${sKey}`;
+            }
+        }
+        return sKey;
+    }
 
-    var getEntityType = function (sEntitySet, oMetadata, bWithoutNamespace) {
-        var i, j, metadataSchema, aEntitySets, sReturn;
-        for (i = oMetadata.dataServices.schema.length - 1; i >= 0; i -= 1) {
+    function getEntitySetFromType (sEntityType, oMetadata) {
+        let metadataSchema;
+        let aEntitySets;
+        for (let i = oMetadata.dataServices.schema.length - 1; i >= 0; --i) {
             metadataSchema = oMetadata.dataServices.schema[i];
             if (metadataSchema.entityContainer) {
                 aEntitySets = metadataSchema.entityContainer[0].entitySet;
-                for (j = aEntitySets.length - 1; j >= 0; j -= 1) {
-                    if (aEntitySets[j].name === sEntitySet) {
-                        if (bWithoutNamespace) {
-                            sReturn = aEntitySets[j].entityType.slice(metadataSchema.namespace.length + 1);
-                        } else {
-                            sReturn = aEntitySets[j].entityType;
-                        }
-                        return sReturn;
+                for (let j = aEntitySets.length - 1; j >= 0; --j) {
+                    if (aEntitySets[j].entityType === sEntityType) {
+                        return aEntitySets[j].name;
                     }
                 }
             }
         }
-    };
+    }
 
-    var getAssociation = function (sEntityType, sNavProperty, oMetadata) {
-        var i, j, k, aNsEntityType, metadataSchema, sNameSpace, oNavProperty;
-        aNsEntityType = sEntityType.split(".");
-        for (i = oMetadata.dataServices.schema.length - 1; i >= 0; i -= 1) {
+    function getAssociation (sEntityType, sNavProperty, oMetadata) {
+        let metadataSchema;
+        let sNameSpace;
+        let oNavProperty;
+        const aNsEntityType = sEntityType.split(".");
+        for (let i = oMetadata.dataServices.schema.length - 1; i >= 0; --i) {
             metadataSchema = oMetadata.dataServices.schema[i];
             sNameSpace = aNsEntityType[0];
             if (aNsEntityType.length > 2) {
-                for (k = 1; k < aNsEntityType.length - 1; k += 1) {
-                    sNameSpace += "." + aNsEntityType[k];
+                for (let k = 1; k < aNsEntityType.length - 1; ++k) {
+                    sNameSpace += `.${aNsEntityType[k]}`;
                 }
             }
             if (metadataSchema.namespace === sNameSpace) {
-                for (j = 0; j < metadataSchema.entityType.length; j += 1) {
+                for (let j = 0; j < metadataSchema.entityType.length; ++j) {
                     if (metadataSchema.entityType[j].name === aNsEntityType[aNsEntityType.length - 1]) {
                         if (metadataSchema.entityType[j].navigationProperty) {
-                            for (k = 0; k < metadataSchema.entityType[j].navigationProperty.length; k += 1) {
+                            for (let k = 0; k < metadataSchema.entityType[j].navigationProperty.length; ++k) {
                                 if (metadataSchema.entityType[j].navigationProperty[k].name === sNavProperty) {
                                     oNavProperty = metadataSchema.entityType[j].navigationProperty[k];
                                     return { name: oNavProperty.relationship, toRole: oNavProperty.toRole };
@@ -397,29 +450,30 @@ sap.ui.define([
                 }
             }
         }
-    };
+    }
 
-    var getNavEntitySet = function (sEntitySet, sNavProperty, oMetadata) {
-        var sEntityType, termTargetType, oAssociation, i, metadataSchema, j, sAssociationSet, k;
-        sEntityType = getEntityType(sEntitySet, oMetadata);
+    function getNavEntitySet (sEntitySet, sNavProperty, oMetadata) {
+        let metadataSchema;
+        let sAssociationSet;
+        const sEntityType = getEntityType(sEntitySet, oMetadata);
         if (sNavProperty.charAt(0) === "@") {
             if (oMapping.termDefinitions && oMapping.termDefinitions[sNavProperty]) {
-                termTargetType = oMapping.termDefinitions[sNavProperty];
+                let termTargetType = oMapping.termDefinitions[sNavProperty];
                 if (termTargetType.indexOf("Collection") >= 0) {
                     termTargetType = termTargetType.slice(termTargetType.indexOf("(") + 1, termTargetType.indexOf(")"));
                 }
                 return getEntitySetFromType(termTargetType, oMetadata);
             }
         } else {
-            oAssociation = getAssociation(sEntityType, sNavProperty, oMetadata);
+            const oAssociation = getAssociation(sEntityType, sNavProperty, oMetadata);
             if (oAssociation) {
-                for (i = oMetadata.dataServices.schema.length - 1; i >= 0; i -= 1) {
+                for (let i = oMetadata.dataServices.schema.length - 1; i >= 0; --i) {
                     metadataSchema = oMetadata.dataServices.schema[i];
                     if (metadataSchema.entityContainer && metadataSchema.entityContainer[0].associationSet) {
-                        for (j = metadataSchema.entityContainer[0].associationSet.length - 1; j >= 0; j -= 1) {
+                        for (let j = metadataSchema.entityContainer[0].associationSet.length - 1; j >= 0; --j) {
                             sAssociationSet = metadataSchema.entityContainer[0].associationSet[j];
                             if (sAssociationSet.association === oAssociation.name) {
-                                for (k = 0; k < sAssociationSet.end.length; k += 1) {
+                                for (let k = 0; k < sAssociationSet.end.length; ++k) {
                                     if (sAssociationSet.end[k].role === oAssociation.toRole) {
                                         return sAssociationSet.end[k].entitySet;
                                     }
@@ -430,19 +484,21 @@ sap.ui.define([
                 }
             }
         }
-    };
+    }
 
-    var getAssociationMultiplicity = function (sEntitySet, sNavProperty, oMetadata) {
-        var i, j, k, sEntityType, oAssociation, metadataSchema, sAssociation, sEntityTypeName, sToRoleName;
-        sEntityType = getEntityType(sEntitySet, oMetadata);
-        sEntityTypeName = sEntityType.split(".")[sEntityType.split(".").length - 1];
-        oAssociation = getAssociation(sEntityType, sNavProperty, oMetadata);
+    function getAssociationMultiplicity (sEntitySet, sNavProperty, oMetadata) {
+        let metadataSchema;
+        let sAssociation;
+        let sToRoleName;
+        const sEntityType = getEntityType(sEntitySet, oMetadata);
+        const sEntityTypeName = sEntityType.split(".")[sEntityType.split(".").length - 1];
+        const oAssociation = getAssociation(sEntityType, sNavProperty, oMetadata);
         if (oAssociation) {
-            for (i = oMetadata.dataServices.schema.length - 1; i >= 0; i -= 1) {
+            for (let i = oMetadata.dataServices.schema.length - 1; i >= 0; --i) {
                 metadataSchema = oMetadata.dataServices.schema[i];
-                for (j = 0; j < metadataSchema.entityType.length && !sToRoleName; j += 1) {
+                for (let j = 0; j < metadataSchema.entityType.length && !sToRoleName; ++j) {
                     if (metadataSchema.entityType[j].name === sEntityTypeName) {
-                        for (k = 0; k < metadataSchema.entityType[j].navigationProperty.length; k += 1) {
+                        for (let k = 0; k < metadataSchema.entityType[j].navigationProperty.length; ++k) {
                             if (metadataSchema.entityType[j].navigationProperty[k].name === sNavProperty) {
                                 sToRoleName = metadataSchema.entityType[j].navigationProperty[k].toRole;
                                 break;
@@ -450,10 +506,10 @@ sap.ui.define([
                         }
                     }
                 }
-                for (j = metadataSchema.association.length - 1; j >= 0; j -= 1) {
+                for (let j = metadataSchema.association.length - 1; j >= 0; --j) {
                     sAssociation = metadataSchema.association[j];
-                    if (metadataSchema.namespace + "." + sAssociation.name === oAssociation.name) {
-                        for (k = 0; k < sAssociation.end.length; k += 1) {
+                    if (`${metadataSchema.namespace}.${sAssociation.name}` === oAssociation.name) {
+                        for (let k = 0; k < sAssociation.end.length; ++k) {
                             if (sAssociation.end[k].role === sToRoleName) {
                                 return sAssociation.end[k].multiplicity;
                             }
@@ -462,18 +518,18 @@ sap.ui.define([
                 }
             }
         } else {
-            jQuery.sap.log.error("\"" + sNavProperty + "\" wasn't found in the metadata document. Check whether the corresponding search connector is active.");
+            jQuery.sap.log.error(`"${sNavProperty}" wasn't found in the metadata document. Check whether the corresponding search connector is active.`);
             return 0;
         }
-    };
+    }
 
-    var getExpand = function (sEntitySet, oMetadata) {
-        var oExpand, oExpandEntities, aExpand, elem;
-        oExpand = {};
+    function getExpand (sEntitySet, oMetadata) {
+        let elem;
+        const oExpand = {};
         if (oMapping.expand) {
             if (oMapping.expand[getEntityType(sEntitySet, oMetadata)]) {
-                oExpandEntities = oMapping.expand[getEntityType(sEntitySet, oMetadata)];
-                aExpand = [];
+                const oExpandEntities = oMapping.expand[getEntityType(sEntitySet, oMetadata)];
+                const aExpand = [];
                 for (elem in oExpandEntities) {
                     if (oExpandEntities.hasOwnProperty(elem)) {
                         aExpand.push(oExpandEntities[elem]);
@@ -483,18 +539,18 @@ sap.ui.define([
             }
         }
         return oExpand;
-    };
+    }
 
-    var getNavTypeForNavPath = function (sNavPath, sEntityType, oMetadata) {
-        var m, metadataSchema, j, k, l, n;
-        for (m = oMetadata.dataServices.schema.length - 1; m >= 0; m -= 1) {
+    function getNavTypeForNavPath (sNavPath, sEntityType, oMetadata) {
+        let metadataSchema;
+        for (let m = oMetadata.dataServices.schema.length - 1; m >= 0; --m) {
             metadataSchema = oMetadata.dataServices.schema[m];
-            for (j = 0; j < metadataSchema.entityType.length; j += 1) {
+            for (let j = 0; j < metadataSchema.entityType.length; ++j) {
                 if (metadataSchema.entityType[j].name === sEntityType.split(".")[sEntityType.split(".").length - 1]) {
-                    for (k = 0; k < metadataSchema.entityType[j].navigationProperty.length; k += 1) {
+                    for (let k = 0; k < metadataSchema.entityType[j].navigationProperty.length; ++k) {
                         if (metadataSchema.entityType[j].navigationProperty[k].name === sNavPath) {
-                            for (l = 0; l < metadataSchema.association.length; l += 1) {
-                                for (n = metadataSchema.association[l].end.length - 1; n >= 0; n -= 1) {
+                            for (let l = 0; l < metadataSchema.association.length; ++l) {
+                                for (let n = metadataSchema.association[l].end.length - 1; n >= 0; --n) {
                                     if (metadataSchema.association[l].end[n].role === metadataSchema.entityType[j].navigationProperty[k].toRole) {
                                         return (metadataSchema.association[l].end[n].type);
                                     }
@@ -505,15 +561,15 @@ sap.ui.define([
                 }
             }
         }
-    };
+    }
 
     /* UI Renderer */
 
-    var propertyPartsWithStrings = function (aParts, oFormatter) {
-        var oBinding = {}, j;
+    function propertyPartsWithStrings (aParts, oFormatter) {
+        const oBinding = {};
         oBinding.parts = [];
         oBinding.parameters = [];
-        for (j = aParts.length - 1; j >= 0; j -= 1) {
+        for (let j = aParts.length - 1; j >= 0; --j) {
             if (aParts[j].Type === "Path") {
                 if (aParts[j].EdmType) {
                     switch (aParts[j].EdmType) {
@@ -523,7 +579,7 @@ sap.ui.define([
                             break;
                         case "Edm.Time":
                             oBinding.parts.push({
-                                path: aParts[j].Value + "/ms",
+                                path: `${aParts[j].Value}/ms`,
                                 type: new Time({
                                     source: { pattern: "timestamp" },
                                     UTC: true
@@ -556,16 +612,19 @@ sap.ui.define([
             }
         }
         oBinding.formatter = function () {
-            var sValue = "", sPathIndex, k, sLastValue, aValueLastLen, sLastSeparator = "", bEncodeUriComponent = false,
-                aHasValueCount = 0, aBracketSeparatorCount = 0;
+            let sValue = "";
+            let sLastSeparator = "";
+            let bEncodeUriComponent = false;
+            let aHasValueCount = 0;
+            let aBracketSeparatorCount = 0;
             if (arguments && arguments.length >= 1) {
-                sPathIndex = arguments.length - 1;
-                sLastValue = "";
-                aValueLastLen = 0;
+                let sPathIndex = arguments.length - 1;
+                let sLastValue = "";
+                let aValueLastLen = 0;
                 if (aParts && aParts[0] && (aParts[0].Type === "String") && (aParts[0].Value.substr(0, 1) === "#")) {
                     bEncodeUriComponent = true;
                 }
-                for (k = 0; k < aParts.length; k += 1) {
+                for (let k = 0; k < aParts.length; ++k) {
                     if (aParts[k].Type === "Path") {
                         sLastValue = arguments[sPathIndex];
                         if (!sLastValue || (sLastValue.length === 0)) {
@@ -614,192 +673,79 @@ sap.ui.define([
             }
         };
         return oBinding;
-    };
-
-    var searchObj = function (obj, property) {
-        var key;
-        for (key in obj) {
-            if (obj.hasOwnProperty(key)) {
-                if (key === "__metadata") {
-                    continue;
-                } else if (key === property) {
-                    return obj[key];
-                } else if (typeof obj[key] === "object") {
-                    return searchObj(obj[key], property);
-                }
-            }
-        }
-    };
-
-    var newModelValue = function (sUrl) {
-        var iLastSlash, newUrl, newProp, newJSONModel = {}, returnValue;
-        iLastSlash = sUrl.lastIndexOf("/");
-        newUrl = sUrl.slice(0, iLastSlash);
-        newProp = sUrl.slice(iLastSlash + 1);
-        if (!newJSONModels[sUrl]) {
-            newJSONModel = new JSONModel();
-            newJSONModel.loadData(newUrl, null, false);
-            newJSONModels[sUrl] = newJSONModel.getData();
-        } else {
-            newJSONModel = newJSONModels[sUrl];
-        }
-        if (newJSONModels[sUrl] && newJSONModels[sUrl].d) {
-            if (!newJSONModels[sUrl].d[newProp]) {
-                returnValue = searchObj(newJSONModels[sUrl].d, newProp);
-            } else {
-                returnValue = newJSONModels[sUrl].d[newProp];
-            }
-        }
-        return returnValue;
-    };
-
-    var dataField = function (oField, sEntityType, oMetadata, oFacet) {
-        var oControl, oBinding, sNavProperty, oUrl, oText, oVL, SemanticObject, sIntend;
-        oControl = new Control();
-        oBinding = fieldBinding(oField.Value, oField.EdmType, sEntityType);
-        if (oField.Value && oField.Value["com.sap.vocabularies.UI.v1.IsImageURL"]) {
-            oControl = new Image({ height: "50px" });
-            if (oBinding.BindingInfo) {
-                oControl.bindProperty("src", oBinding.BindingInfo);
-            } else {
-                oControl.setProperty("src", oBinding.String);
-            }
-        } else {
-            if (oField.UrlRef || oField.Url || (oField.Target && oField.Target.Path)) {
-                oControl = new Link({ wrapping: true });
-            } else {
-                oControl = new Text();
-                if (oField.EdmType === "Edm.Decimal" || oField.EdmType === "Edm.Double" || oField.EdmType === "Edm.Single" ||
-                    oField.EdmType === "Edm.Int16" || oField.EdmType === "Edm.Int32" || oField.EdmType === "Edm.Int64") {
-                    oControl.setTextAlign(TextAlign.End);
-                }
-            }
-            oControl.addStyleClass("sapFactsheetUtiDataField");
-            if (oBinding.BindingInfo) {
-                oControl.bindProperty("text", oBinding.BindingInfo);
-            } else {
-                oControl.setProperty("text", oBinding.String);
-            }
-        }
-        if ((oField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldWithNavigation") && oMetadata) {
-            sNavProperty = oField.Target.Path;
-            if (oMapping[sEntityType][sNavProperty.slice(1)]) {
-                if (sNavProperty.charAt(0) === "@") {
-                    if (sNavProperty.indexOf("/") < 0) {
-                        oUrl = oMapping[sEntityType][sNavProperty.slice(1)].UrlRef;
-                    } else {
-                        oUrl = oMapping[sEntityType][sNavProperty.slice(1, sNavProperty.indexOf("/"))].UrlRef;
-                    }
-                    oControl.bindProperty("href", navigationBinding(oUrl));
-                }
-            }
-            oControl.attachPress(function (oEvent) {
-                return false;
-            });
-        }
-        if (oField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldWithUrl") {
-            if (oField.Url.String) {
-                oControl.setHref(oField.Url.String);
-            } else {
-                oControl.bindProperty("href", navigationBinding(oField.Url));
-                //Workaround: no Link if no authority
-                oText = new Text({
-                    wrapping: true
-                });
-                if (oBinding.BindingInfo) {
-                    oText.bindProperty("text", jQuery.extend({}, oBinding.BindingInfo));
-                } else {
-                    oText.setProperty("text", oBinding.String);
-                }
-                oControl.setVisible(false);
-                oVL = new VerticalLayout();
-                oVL.addContent(oControl);
-                oVL.addContent(oText);
-                if (!aAllFacets[aAllFacets.indexOf(oFacet)].Links) {
-                    aAllFacets[aAllFacets.indexOf(oFacet)].Links = [];
-                }
-                if (oField.Url.Apply) {
-                    SemanticObject = oField.Url.Apply.Parameters[0].Value.slice(oField.Url.Apply.Parameters[0].Value.indexOf("#") + 1, oField.Url.Apply.Parameters[0].Value.indexOf("-"));
-                    sIntend = oField.Url.Apply.Parameters[0].Value.slice(oField.Url.Apply.Parameters[0].Value.indexOf("#") + 1, oField.Url.Apply.Parameters[0].Value.indexOf("?"));
-                }
-                aAllFacets[aAllFacets.indexOf(oFacet)].Links.push({
-                    sSemanticObject: SemanticObject,
-                    sIntend: sIntend,
-                    oVL: oVL
-                });
-                //Workaround: no Link if no authority
-            }
-        }
-        //Workaround: no Link if no authority
-        if (oVL) {
-            return oVL;
-        }
-        return oControl;
-
-        //Workaround: no Link if no authority
-    };
+    }
 
-    var labelBinding = function (oField, oLabelProperties, aPropExtensions, bWithColon) {
-        var oLabel, sColon = "", sLabel = "", oPropertyExt, j, k, oParameter;
-        oLabel = new Label(oLabelProperties);
-        oLabel.addStyleClass("sapFactsheetUtiLabel");
-        if (bWithColon) {
-            sColon = ":";
-        }
-        if (oField.Label) {
-            if (oField.Label.String) {
-                oLabel.setText(oField.Label.String.trim() + sColon);
-                oLabel.setTooltip(oField.Label.String.trim());
-            } else if (oField.Label.Path) {
-                oLabel.bindProperty("text", oField.Label.Path);
-                oLabel.bindProperty("tooltip", oField.Label.Path);
-            }
-        } else if (oField.Value) {
-            if (oField.Value.Path && aPropExtensions) {
-                oPropertyExt = aPropExtensions[oField.Value.Path];
-                for (j in oPropertyExt) {
-                    if (oPropertyExt.hasOwnProperty(j)) {
-                        if (j === "http://www.sap.com/Protocols/SAPData") {
-                            if (oPropertyExt[j].label) {
-                                sLabel = oPropertyExt[j].label;
-                                break;
-                            }
-                        }
-                    }
-                }
-            } else if (oField.Value.Apply && (oField.Value.Apply.Name === "odata.concat")) {
-                for (k in oField.Value.Apply.Parameters) {
-                    if (oField.Value.Apply.Parameters.hasOwnProperty(k)) {
-                        oParameter = oField.Value.Apply.Parameters[k];
-                        if (oParameter.Type === "Path") {
-                            oPropertyExt = aPropExtensions[oParameter.Value];
-                            for (j in oPropertyExt) {
-                                if (oPropertyExt.hasOwnProperty(j)) {
-                                    if (j === "http://www.sap.com/Protocols/SAPData") {
-                                        if (oPropertyExt[j].label) {
-                                            sLabel = oPropertyExt[j].label;
-                                            break;
-                                        }
+    function navigationBinding (oUrl) {
+        const aUrlParts = [];
+        let aParams;
+        let aTemplateParts;
+        let aTemplateValueParts;
+        let oUrlParts = {};
+        let oParaValue;
+        let oResolution;
+        let sSystem;
+        if (oUrl && oUrl.Apply) {
+            aParams = oUrl.Apply.Parameters;
+            switch (oUrl.Apply.Name) {
+                case "odata.fillUriTemplate":
+                    aParams[0].Value = aParams[0].Value.trim();
+                    aTemplateParts = aParams[0].Value.split("{");
+                    for (let j = 0; j < aTemplateParts.length; ++j) {
+                        if (aTemplateParts[j].indexOf("}") < 0) {
+                            aUrlParts.push({ Value: aTemplateParts[j], Type: "String" });
+                        } else {
+                            aTemplateValueParts = aTemplateParts[j].split("}");
+                            oUrlParts = {};
+                            oUrlParts.Value = aTemplateValueParts[0];
+                            oUrlParts.Type = "Path";
+                            for (j = 1; j < aParams.length; ++j) {
+                                if (aParams[j].Name === oUrlParts.Value) {
+                                    oParaValue = aParams[j].Value;
+                                    if (oParaValue.Path) {
+                                        oUrlParts.Value = oParaValue.Path;
+                                    } else if (oParaValue.Apply && oParaValue.Apply.Name && oParaValue.Apply.Name.toLowerCase() === "odata.uriencode") {
+                                        oUrlParts.Value = oParaValue.Apply.Parameters[0].Value;
                                     }
+                                    break;
                                 }
                             }
-                            break;
+                            aUrlParts.push(oUrlParts);
+                            aUrlParts.push({ Value: aTemplateValueParts[1], Type: "String" });
                         }
                     }
-                }
+                    oResolution = sap.ushell.Container.getService("NavTargetResolutionInternal").getCurrentResolution();
+                    if (oResolution && oResolution.url) {
+                        sSystem = jQuery.sap.getUriParameters(oResolution.url).get("sap-system");
+                        if (sSystem) {
+                            aUrlParts.push({ Type: "String", Value: `&sap-system=${sSystem}` });
+                        }
+                    }
+                    break;
+                default:
+                    break;
             }
-            oLabel.setText(sLabel + sColon);
-            oLabel.setTooltip(sLabel);
         }
-        return oLabel;
-    };
+        return propertyPartsWithStrings(aUrlParts);
+    }
 
-    var fieldBinding = function (oFieldValue, sEdmType, sEntityType) {
-        var oBinding = {}, aPartsWithPropAnnotations = [], aParameters = [], aTextParts = [],
-            i, j, oPropAnnotations, aParts, oUrl, sUrlProperties, aParams, aTemplProperties, aUrlPathProperties, oParaValue, oParam, fnType;
-        var getPropAnnotations = function (sEntityType, attribute1, attribute2) {
-            var oPropAnnotations, result = {};
-            oPropAnnotations = oMapping.propertyAnnotations[sEntityType];
+    function fieldBinding (oFieldValue, sEdmType, sEntityType) {
+        const oBinding = {};
+        const aPartsWithPropAnnotations = [];
+        let aParameters = [];
+        const aTextParts = [];
+        let oPropAnnotations;
+        let aParts;
+        let oUrl;
+        let sUrlProperties;
+        let aParams;
+        let aTemplProperties;
+        let aUrlPathProperties;
+        let oParaValue;
+        let oParam;
+        let fnType;
+        function getPropAnnotations (sEntityType, attribute1, attribute2) {
+            const result = {};
+            const oPropAnnotations = oMapping.propertyAnnotations[sEntityType];
             if (oPropAnnotations && oPropAnnotations[attribute1] && oPropAnnotations[attribute1][attribute2]) {
                 if (oPropAnnotations[attribute1][attribute2].Path) {
                     result.Type = "Path";
@@ -810,24 +756,24 @@ sap.ui.define([
                 }
             }
             return result;
-        };
+        }
         if (!oFieldValue) {
             return false;
         }
-        if (oFieldValue.Apply) { //apply function
+        if (oFieldValue.Apply) { // apply function
             if (oFieldValue.Apply.Name === "odata.concat") {
                 if (sEntityType && oMapping.propertyAnnotations && oMapping.propertyAnnotations[sEntityType]) {
                     aParts = oFieldValue.Apply.Parameters;
-                    for (j = 0; j < aParts.length; j += 1) {
+                    for (let j = 0; j < aParts.length; ++j) {
                         aPartsWithPropAnnotations.push(aParts[j]);
                         if (aParts[j].Type === "Path") {
                             oPropAnnotations = getPropAnnotations(sEntityType, aParts[j].Value, "Org.OData.Measures.V1.ISOCurrency");
-                            if (!$.isEmptyObject(oPropAnnotations)) {
+                            if (!jQuery.isEmptyObject(oPropAnnotations)) {
                                 aPartsWithPropAnnotations.push({ Type: "String", Value: " " });
                                 aPartsWithPropAnnotations.push({ Type: oPropAnnotations.Type, Value: oPropAnnotations.Value });
                             }
                             oPropAnnotations = getPropAnnotations(sEntityType, aParts[j].Value, "Org.OData.Measures.V1.Unit");
-                            if (!$.isEmptyObject(oPropAnnotations)) {
+                            if (!jQuery.isEmptyObject(oPropAnnotations)) {
                                 aPartsWithPropAnnotations.push({ Type: "String", Value: " " });
                                 aPartsWithPropAnnotations.push({ Type: oPropAnnotations.Type, Value: oPropAnnotations.Value });
                             }
@@ -839,8 +785,8 @@ sap.ui.define([
                 }
             }
         } else if (oFieldValue.Path) {
-            //property path
-            if (oFieldValue.Path.charAt(0) === "@") { //property path with navigation defined in annotation
+            // property path
+            if (oFieldValue.Path.charAt(0) === "@") { // property path with navigation defined in annotation
                 oUrl = oMapping[sEntityType][oFieldValue.Path.slice(1, oFieldValue.Path.indexOf("/"))].UrlRef;
                 sUrlProperties = oFieldValue.Path.slice(oFieldValue.Path.indexOf("/") + 1);
                 if (oUrl && oUrl.Apply) {
@@ -848,17 +794,17 @@ sap.ui.define([
                     switch (oUrl.Apply.Name) {
                         case "odata.concat":
                             aParameters = aParams;
-                            aParameters.push({ Type: "String", Value: "/" + sUrlProperties });
+                            aParameters.push({ Type: "String", Value: `/${sUrlProperties}` });
                             break;
                         case "odata.fillUriTemplate":
                             aTemplProperties = aParams[0].Value.split("{");
-                            for (i in aTemplProperties) {
+                            for (const i in aTemplProperties) {
                                 if (aTemplProperties.hasOwnProperty(i)) {
                                     if (aTemplProperties[i].indexOf("}") < 0) {
                                         aParameters.push({ Type: "String", Value: aTemplProperties[i] });
                                     } else {
                                         aUrlPathProperties = aTemplProperties[i].split("}");
-                                        for (j = 1; j < aParams.length; j += 1) {
+                                        for (let j = 1; j < aParams.length; ++j) {
                                             if (aParams[j].Name === aUrlPathProperties[0]) {
                                                 oParaValue = aParams[j].Value;
                                                 if (oParaValue.Path) {
@@ -867,7 +813,7 @@ sap.ui.define([
                                                     oParam = oParaValue.Apply.Parameters[0];
                                                     aParameters.push({ Type: oParam.Type, Value: encodeURIComponent(oParam.Value) });
                                                     // HANA Live - put property as string to parameters (later needed for constructing URL)
-                                                    aParameters.push({ Type: "String", Value: "{" + encodeURIComponent(oParam.Value) + "}" });
+                                                    aParameters.push({ Type: "String", Value: `{${encodeURIComponent(oParam.Value)}}` });
                                                 }
                                             }
                                         }
@@ -875,8 +821,8 @@ sap.ui.define([
                                     }
                                 }
                             }
-                            aParameters.push({ Type: "String", Value: "/" + sUrlProperties });
-                            //HANA Live
+                            aParameters.push({ Type: "String", Value: `/${sUrlProperties}` });
+                            // HANA Live
                             oBinding.fnChange = fnChange;
                             break;
                         default:
@@ -884,12 +830,12 @@ sap.ui.define([
                     }
                     oBinding.BindingInfo = propertyPartsWithStrings(aParameters, newModelValue);
                 } else if (oUrl && oUrl.Path) {
-                    aParameters.push({ Type: "Path", Value: oUrl.Path }, { Type: "String", Value: "/" + sUrlProperties });
+                    aParameters.push({ Type: "Path", Value: oUrl.Path }, { Type: "String", Value: `/${sUrlProperties}` });
                     oBinding.BindingInfo = propertyPartsWithStrings(aParameters, newModelValue);
                 } else if (oUrl && oUrl.String) {
-                    oBinding.String = newModelValue(oUrl.String + "/" + sUrlProperties);
+                    oBinding.String = newModelValue(`${oUrl.String}/${sUrlProperties}`);
                 }
-            } else { //property path defined in the model
+            } else { // property path defined in the model
                 oBinding.BindingInfo = {};
                 switch (sEdmType) {
                     case "Edm.DateTimeOffset":
@@ -898,7 +844,7 @@ sap.ui.define([
                         break;
                     case "Edm.Time":
                         oBinding.BindingInfo = {
-                            path: oFieldValue.Path + "/ms",
+                            path: `${oFieldValue.Path}/ms`,
                             type: new Time({
                                 source: { pattern: "timestamp" },
                                 UTC: true
@@ -922,11 +868,11 @@ sap.ui.define([
                         if (oMapping.propertyAnnotations) {
                             aTextParts.push({ Type: "Path", Value: oFieldValue.Path, EdmType: sEdmType }, { Type: "String", Value: " " });
                             oPropAnnotations = getPropAnnotations(sEntityType, oFieldValue.Path, "Org.OData.Measures.V1.ISOCurrency");
-                            if (!$.isEmptyObject(oPropAnnotations)) {
+                            if (!jQuery.isEmptyObject(oPropAnnotations)) {
                                 aTextParts.push({ Type: oPropAnnotations.Type, Value: oPropAnnotations.Value });
                             }
                             oPropAnnotations = getPropAnnotations(sEntityType, oFieldValue.Path, "Org.OData.Measures.V1.Unit");
-                            if (!$.isEmptyObject(oPropAnnotations)) {
+                            if (!jQuery.isEmptyObject(oPropAnnotations)) {
                                 aTextParts.push({ Type: oPropAnnotations.Type, Value: oPropAnnotations.Value });
                             }
                             oBinding.BindingInfo = propertyPartsWithStrings(aTextParts);
@@ -940,82 +886,207 @@ sap.ui.define([
                 }
             }
         } else if (oFieldValue.String) {
-            //hard coded string in annotation
+            // hard coded string in annotation
             oBinding.String = oFieldValue.String;
         }
         return oBinding;
-    };
+    }
 
-    var navigationBinding = function (oUrl) {
-        var aUrlParts = [], aParams, aTemplateParts, j, aTemplValueParts, oUrlParts = {}, oParaValue, oResolution, sSystem;
-        if (oUrl && oUrl.Apply) {
-            aParams = oUrl.Apply.Parameters;
-            switch (oUrl.Apply.Name) {
-                case "odata.fillUriTemplate":
-                    aParams[0].Value = aParams[0].Value.trim();
-                    aTemplateParts = aParams[0].Value.split("{");
-                    for (j = 0; j < aTemplateParts.length; j += 1) {
-                        if (aTemplateParts[j].indexOf("}") < 0) {
-                            aUrlParts.push({ Value: aTemplateParts[j], Type: "String" });
-                        } else {
-                            aTemplValueParts = aTemplateParts[j].split("}");
-                            oUrlParts = {};
-                            oUrlParts.Value = aTemplValueParts[0];
-                            oUrlParts.Type = "Path";
-                            for (j = 1; j < aParams.length; j += 1) {
-                                if (aParams[j].Name === oUrlParts.Value) {
-                                    oParaValue = aParams[j].Value;
-                                    if (oParaValue.Path) {
-                                        oUrlParts.Value = oParaValue.Path;
-                                    } else if (oParaValue.Apply && oParaValue.Apply.Name && oParaValue.Apply.Name.toLowerCase() === "odata.uriencode") {
-                                        oUrlParts.Value = oParaValue.Apply.Parameters[0].Value;
-                                    }
-                                    break;
-                                }
+    function dataField (oField, sEntityType, oMetadata, oFacet) {
+        let oControl;
+        let sNavProperty;
+        let oUrl;
+        let oText;
+        let oVL;
+        let SemanticObject;
+        let sIntend;
+        oControl = new Control();
+        const oBinding = fieldBinding(oField.Value, oField.EdmType, sEntityType);
+        if (oField.Value && oField.Value["com.sap.vocabularies.UI.v1.IsImageURL"]) {
+            oControl = new Image({ height: "50px" });
+            if (oBinding.BindingInfo) {
+                oControl.bindProperty("src", oBinding.BindingInfo);
+            } else {
+                oControl.setProperty("src", oBinding.String);
+            }
+        } else {
+            if (oField.UrlRef || oField.Url || (oField.Target && oField.Target.Path)) {
+                oControl = new Link({ wrapping: true });
+            } else {
+                oControl = new Text();
+                if (oField.EdmType === "Edm.Decimal" || oField.EdmType === "Edm.Double" || oField.EdmType === "Edm.Single" ||
+                    oField.EdmType === "Edm.Int16" || oField.EdmType === "Edm.Int32" || oField.EdmType === "Edm.Int64") {
+                    oControl.setTextAlign(TextAlign.End);
+                }
+            }
+            oControl.addStyleClass("sapFactsheetUtiDataField");
+            if (oBinding.BindingInfo) {
+                oControl.bindProperty("text", oBinding.BindingInfo);
+            } else {
+                oControl.setProperty("text", oBinding.String);
+            }
+        }
+        if ((oField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldWithNavigation") && oMetadata) {
+            sNavProperty = oField.Target.Path;
+            if (oMapping[sEntityType][sNavProperty.slice(1)]) {
+                if (sNavProperty.charAt(0) === "@") {
+                    if (sNavProperty.indexOf("/") < 0) {
+                        oUrl = oMapping[sEntityType][sNavProperty.slice(1)].UrlRef;
+                    } else {
+                        oUrl = oMapping[sEntityType][sNavProperty.slice(1, sNavProperty.indexOf("/"))].UrlRef;
+                    }
+                    oControl.bindProperty("href", navigationBinding(oUrl));
+                }
+            }
+            oControl.attachPress((oEvent) => {
+                return false;
+            });
+        }
+        if (oField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldWithUrl") {
+            if (oField.Url.String) {
+                oControl.setHref(oField.Url.String);
+            } else {
+                oControl.bindProperty("href", navigationBinding(oField.Url));
+                // Workaround: no Link if no authority
+                oText = new Text({
+                    wrapping: true
+                });
+                if (oBinding.BindingInfo) {
+                    oText.bindProperty("text", jQuery.extend({}, oBinding.BindingInfo));
+                } else {
+                    oText.setProperty("text", oBinding.String);
+                }
+                oControl.setVisible(false);
+                oVL = new VerticalLayout();
+                oVL.addContent(oControl);
+                oVL.addContent(oText);
+                if (!aAllFacets[aAllFacets.indexOf(oFacet)].Links) {
+                    aAllFacets[aAllFacets.indexOf(oFacet)].Links = [];
+                }
+                if (oField.Url.Apply) {
+                    SemanticObject = oField.Url.Apply.Parameters[0].Value.slice(oField.Url.Apply.Parameters[0].Value.indexOf("#") + 1, oField.Url.Apply.Parameters[0].Value.indexOf("-"));
+                    sIntend = oField.Url.Apply.Parameters[0].Value.slice(oField.Url.Apply.Parameters[0].Value.indexOf("#") + 1, oField.Url.Apply.Parameters[0].Value.indexOf("?"));
+                }
+                aAllFacets[aAllFacets.indexOf(oFacet)].Links.push({
+                    sSemanticObject: SemanticObject,
+                    sIntend: sIntend,
+                    oVL: oVL
+                });
+                // Workaround: no Link if no authority
+            }
+        }
+        // Workaround: no Link if no authority
+        if (oVL) {
+            return oVL;
+        }
+        return oControl;
+
+        // Workaround: no Link if no authority
+    }
+
+    function labelBinding (oField, oLabelProperties, aPropExtensions, bWithColon) {
+        let sColon = "";
+        let sLabel = "";
+        let oPropertyExt;
+        let oParameter;
+        const oLabel = new Label(oLabelProperties);
+        oLabel.addStyleClass("sapFactsheetUtiLabel");
+        if (bWithColon) {
+            sColon = ":";
+        }
+        if (oField.Label) {
+            if (oField.Label.String) {
+                oLabel.setText(oField.Label.String.trim() + sColon);
+                oLabel.setTooltip(oField.Label.String.trim());
+            } else if (oField.Label.Path) {
+                oLabel.bindProperty("text", oField.Label.Path);
+                oLabel.bindProperty("tooltip", oField.Label.Path);
+            }
+        } else if (oField.Value) {
+            if (oField.Value.Path && aPropExtensions) {
+                oPropertyExt = aPropExtensions[oField.Value.Path];
+                for (const j in oPropertyExt) {
+                    if (oPropertyExt.hasOwnProperty(j)) {
+                        if (j === "http://www.sap.com/Protocols/SAPData") {
+                            if (oPropertyExt[j].label) {
+                                sLabel = oPropertyExt[j].label;
+                                break;
                             }
-                            aUrlParts.push(oUrlParts);
-                            aUrlParts.push({ Value: aTemplValueParts[1], Type: "String" });
                         }
                     }
-                    oResolution = sap.ushell.Container.getService("NavTargetResolutionInternal").getCurrentResolution();
-                    if (oResolution && oResolution.url) {
-                        sSystem = jQuery.sap.getUriParameters(oResolution.url).get("sap-system");
-                        if (sSystem) {
-                            aUrlParts.push({ Type: "String", Value: "&sap-system=" + sSystem });
+                }
+            } else if (oField.Value.Apply && (oField.Value.Apply.Name === "odata.concat")) {
+                for (const k in oField.Value.Apply.Parameters) {
+                    if (oField.Value.Apply.Parameters.hasOwnProperty(k)) {
+                        oParameter = oField.Value.Apply.Parameters[k];
+                        if (oParameter.Type === "Path") {
+                            oPropertyExt = aPropExtensions[oParameter.Value];
+                            for (const j in oPropertyExt) {
+                                if (oPropertyExt.hasOwnProperty(j)) {
+                                    if (j === "http://www.sap.com/Protocols/SAPData") {
+                                        if (oPropertyExt[j].label) {
+                                            sLabel = oPropertyExt[j].label;
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            break;
                         }
                     }
-                    break;
-                default:
-                    break;
+                }
             }
+            oLabel.setText(sLabel + sColon);
+            oLabel.setTooltip(sLabel);
         }
-        return propertyPartsWithStrings(aUrlParts);
-    };
+        return oLabel;
+    }
 
-    var columnHAlign = function (oField) {
-        var hAlign = TextAlign.Begin;
+    function columnHAlign (oField) {
+        let hAlign = TextAlign.Begin;
         if (oField.EdmType === "Edm.Decimal" || oField.EdmType === "Edm.Double" || oField.EdmType === "Edm.Single" ||
             oField.EdmType === "Edm.Int16" || oField.EdmType === "Edm.Int32" || oField.EdmType === "Edm.Int64") {
             hAlign = TextAlign.End;
         }
-        return hAlign;
-    };
+        return hAlign;
+    }
+
+    /**
+     * Returns the importance (High, Medium, Low) of a given record.
+     * Necessary as the annotation for importance changed in OData V4 and we'd like to support both V2 and V4.
+     * @param {object} oRecord as object.
+     * @returns {string} Importance of the record (High, Medium, Low).
+     */
+    function getImportanceOfRecord (oRecord) {
+        let sEnumMember = "";
+        if (oRecord.Importance) {
+            sEnumMember = oRecord.Importance.EnumMember;
+        } else if (oRecord["com.sap.vocabularies.UI.v1.Importance"]) {
+            sEnumMember = oRecord["com.sap.vocabularies.UI.v1.Importance"].EnumMember;
+        }
+        return sEnumMember.substr(sEnumMember.indexOf("/") + 1);
+    }
 
-    var formLayoutFactory = function (oModel, sEntitySet, aFormData, oMaxItems, oMetadata, oFacet) {
-        var i, j = 0, iSumPrioHigh = 0, iSumPrioMedium = 0, iSumPrioLow = 0,
-            sEntityType, aPropertyExtensions, oImportance, oControl, oLabel, oSimpleForm;
+    function formLayoutFactory (oModel, sEntitySet, aFormData, oMaxItems, oMetadata, oFacet) {
+        let j = 0;
+        let iSumPrioHigh = 0;
+        let iSumPrioMedium = 0;
+        let iSumPrioLow = 0;
+        let oImportance;
+        let oControl;
+        let oLabel;
         if (!oMetadata) {
             oMetadata = oModel.getServiceMetadata();
         }
         if (!aFormData) {
             aFormData = [];
         }
-        sEntityType = getEntityType(sEntitySet, oMetadata);
-        oSimpleForm = new SimpleForm({
+        const sEntityType = getEntityType(sEntitySet, oMetadata);
+        const oSimpleForm = new SimpleForm({
             labelMinWidth: 150,
             maxContainerCols: 2
         });
-        aPropertyExtensions = (oMapping.propertyExtensions) ? oMapping.propertyExtensions[sEntityType] : [];
+        const aPropertyExtensions = (oMapping.propertyExtensions) ? oMapping.propertyExtensions[sEntityType] : [];
         if (oMaxItems && oMaxItems.High) {
             iSumPrioHigh = oMaxItems.High;
         }
@@ -1025,7 +1096,7 @@ sap.ui.define([
         if (oMaxItems && oMaxItems.Low) {
             iSumPrioLow = oMaxItems.Low;
         }
-        for (i = 0; i < aFormData.length; i += 1) {
+        for (let i = 0; i < aFormData.length; ++i) {
             oImportance = getImportanceOfRecord(aFormData[i]);
             if (oMaxItems && (oImportance === "High")) {
                 if (iSumPrioHigh) {
@@ -1035,7 +1106,7 @@ sap.ui.define([
                 }
             } else if (oMaxItems && (oImportance === "Medium")) {
                 if (iSumPrioMedium) {
-                    iSumPrioMedium -= 1;
+                    --iSumPrioMedium;
                 } else {
                     continue;
                 }
@@ -1049,7 +1120,7 @@ sap.ui.define([
             if (oMaxItems && oMaxItems.Total && (j >= oMaxItems.Total)) {
                 break;
             }
-            j += 1;
+            ++j;
             oControl = new Control().setModel(oModel);
             oLabel = labelBinding(aFormData[i], { textAlign: TextAlign.End }, aPropertyExtensions, false);
             oLabel.addStyleClass("sapFactsheetUtiFormPadding");
@@ -1063,147 +1134,85 @@ sap.ui.define([
         }
         oSimpleForm.addStyleClass("sapFactsheetUtiFormLayout");
         return oSimpleForm;
-    };
+    }
 
-    var facetFactory = function (oModel, sEntitySet, oSelectedFacet, sBindingPath, oFacet) {
-        var sAssociationMultiplicity = "", aTG = [],
-            i, oMetadata, oTG, sNavPath, sAnnoPath, aAnnoPath, sNavEntitySet, oList, aIdentification, oVL, aStatusInfo, oFG, sEntityType, aColumns, oPropertyExtensions;
-        oMetadata = oModel.getServiceMetadata();
-        switch (oSelectedFacet.RecordType) {
-            case "com.sap.vocabularies.UI.v1.ReferenceFacet":
-                oTG = new UnifiedThingGroup();
-                if (oSelectedFacet.Label && oSelectedFacet.Label.String) {
-                    oTG.setTitle(oSelectedFacet.Label.String);
-                }
-                sNavPath = oSelectedFacet.Target.AnnotationPath;
-                sAnnoPath = sNavPath.substring(sNavPath.lastIndexOf("@") + 1);
-                sNavPath = sNavPath.substring(0, sNavPath.lastIndexOf("@") - 1);
-                if (sNavPath) {
-                    sAssociationMultiplicity = getAssociationMultiplicity(sEntitySet, sNavPath, oMetadata);
-                }
-                aAnnoPath = sAnnoPath.split("#");
-                switch (aAnnoPath[0]) {
-                    case "com.sap.vocabularies.UI.v1.LineItem":
-                    case "com.sap.vocabularies.UI.v1.Chart":
-                    case "com.sap.vocabularies.UI.v1.Badge":
-                    case "com.sap.vocabularies.UI.v1.Identification":
-                        if (sNavPath) {
-                            sNavEntitySet = getNavEntitySet(sEntitySet, sNavPath, oMetadata);
-                            sEntityType = getEntityType(sNavEntitySet, oMetadata);
-                        } else {
-                            sEntityType = getEntityType(sEntitySet, oMetadata);
-                        }
-                        // In case of a chart we need to have the definition of the line items
-                        if (aAnnoPath[0] === "com.sap.vocabularies.UI.v1.Chart") {
-                            sAnnoPath = "com.sap.vocabularies.UI.v1.LineItem";
-                        }
-                        aColumns = oMapping[sEntityType][sAnnoPath];
-                        if (oMapping.propertyExtensions) {
-                            oPropertyExtensions = oMapping.propertyExtensions[sEntityType];
-                        }
-                        if (sAssociationMultiplicity === "*" && aAnnoPath[0] !== "com.sap.vocabularies.UI.v1.Identification") {
-                            oList = itemListFactory(oModel, aColumns, sEntityType, oMetadata, sBindingPath + "/" + sNavPath, oSelectedFacet, oPropertyExtensions, oFacet);
-                            oTG.setContent(oList);
-                        }
-                        if (aAnnoPath[0] === "com.sap.vocabularies.UI.v1.Identification") {
-                            aIdentification = oMapping[sEntityType]["com.sap.vocabularies.UI.v1.Identification"];
-                            oVL = new VerticalLayout({ width: "100%" }).setModel(oModel);
-                            if (sNavPath) {
-                                oVL.addContent(formLayoutFactory(oModel, sNavEntitySet, aIdentification, null, null, oFacet)).addStyleClass("sapFactsheetUtiPanel");
-                                oVL.bindElement(sBindingPath + "/" + sNavPath);
-                            } else {
-                                oVL.addContent(formLayoutFactory(oModel, sEntitySet, aIdentification, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel"));
-                            }
-                            oTG.setContent(oVL);
-                        }
-                        break;
-                    case "com.sap.vocabularies.UI.v1.StatusInfo":
-                        if (sNavPath) {
-                            sNavEntitySet = getNavEntitySet(sEntitySet, sNavPath, oMetadata);
-                            aStatusInfo = oMapping[getEntityType(sNavEntitySet, oMetadata)]["com.sap.vocabularies.UI.v1.StatusInfo"];
-                            oTG.setContent(formLayoutFactory(oModel, sNavEntitySet, aStatusInfo, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel").bindElement(sBindingPath + "/" + sNavPath));
-                        } else {
-                            aStatusInfo = oMapping[getEntityType(sEntitySet, oMetadata)]["com.sap.vocabularies.UI.v1.StatusInfo"];
-                            oTG.setContent(formLayoutFactory(oModel, sEntitySet, aStatusInfo, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel"));
-                        }
-                        break;
-                    case "com.sap.vocabularies.UI.v1.FieldGroup":
-                        oFG = oMapping[getEntityType(sEntitySet, oMetadata)][sAnnoPath];
-                        if (oFG) {
-                            if (!oTG.getTitle() || (oTG.getTitle() === "")) {
-                                if (oFG.Label) {
-                                    if (oFG.Label.String) {
-                                        oTG.setTitle(oFG.Label.String);
-                                    } else if (oFG.Label.Path) {
-                                        oTG.bindProperty("title", oFG.Label.Path);
+    function checkLinks (index) {
+        let aItems;
+        let aCells;
+        let aLinks;
+        if (oLinkAuthorised.InteropCompleted === true) {
+            for (let i = 0; i < aAllFacets.length; ++i) {
+                if (aAllFacets[i].bLoaded && !aAllFacets[i].bProcessed && aAllFacets[i].Links) {
+                    aLinks = aAllFacets[i].Links;
+                    for (let j = 0; j < aLinks.length; ++j) {
+                        if (oLinkAuthorised.hasOwnProperty(aLinks[j].sIntend) === true) {
+                            if (aAllFacets[i].bIsTable === true) {
+                                if (aAllFacets[i].oTableItems) {
+                                    aItems = aAllFacets[i].oTableItems;
+                                    for (let k = 0; k < aItems.length; ++k) {
+                                        aCells = aItems[k].getCells();
+                                        for (let n = 0; n < aCells.length; ++n) {
+                                            if (aCells[n] instanceof VerticalLayout &&
+                                                aCells[n].getContent()[0].getBindingInfo("href").parts === aLinks[j].oVL.getContent()[0].getBindingInfo("href").parts &&
+                                                aCells[n].getContent()[1].getBindingInfo("text").parts === aLinks[j].oVL.getContent()[1].getBindingInfo("text").parts) {
+                                                aCells[n].getContent()[0].setVisible(true);
+                                                aCells[n].getContent()[1].setVisible(false);
+                                            }
+                                        }
                                     }
                                 }
-                            }
-                            if (sNavPath) {
-                                sNavEntitySet = getNavEntitySet(sEntitySet, sNavPath, oMetadata);
-                                oTG.setContent(formLayoutFactory(oModel, sNavEntitySet, oFG.Data, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel").bindElement(sBindingPath + "/" + sNavPath));
                             } else {
-                                oTG.setContent(formLayoutFactory(oModel, sEntitySet, oFG.Data, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel"));
+                                aLinks[j].oVL.getContent()[0].setVisible(true);
+                                aLinks[j].oVL.getContent()[1].setVisible(false);
                             }
+                        } else if (aAllFacets[i].bIsTable === false) {
+                            aLinks[j].oVL.getContent()[1].setText(aLinks[j].oVL.getContent()[0].getText());
                         }
-                        break;
-                    default:
-                        break;
-                }
-                return oTG;
-            case "com.sap.vocabularies.UI.v1.ReferenceURLFacet":
-                oTG = new ThingGroup({ title: oSelectedFacet.Label.String });
-                oTG.setContent(showHTML(oSelectedFacet));
-                return oTG;
-            case "com.sap.vocabularies.UI.v1.CollectionFacet":
-                for (i = 0; i < oSelectedFacet.Facets.length; i += 1) {
-                    aTG.push(facetFactory(oModel, sEntitySet, oSelectedFacet.Facets[i], sBindingPath, oFacet));
+                        aAllFacets[i].bProcessed = true;
+                    }
                 }
-                return aTG;
-            default:
-                break;
+            }
         }
-    };
-
-    var showHTML = function (oHTMLData) {
-        var oImage, oHTMLCtrl, sIframe;
-        switch (oHTMLData.UrlContentType.String) {
-            case "image/png":
-            case "image/jpeg":
-            case "image/gif":
-                oImage = new Image({ width: "100%" });
-                if (oHTMLData.Url.String) {
-                    oImage.setSrc(oHTMLData.Url.String);
-                }
-                return oImage;
-            default:
-                oHTMLCtrl = new HTML();
-                if (oHTMLData.Url.String) {
-                    oHTMLCtrl.setContent("<iframe src = '" + oHTMLData.Url.String + "' width='100%' height='250px' frameborder='0'></iframe>");
-                } else if (oHTMLData.Url.Path) {
-                    oHTMLCtrl.bindProperty("content", {
-                        path: oHTMLData.Url.Path,
-                        formatter: function (/*value*/) {
-                            sIframe = "<iframe src = '" + oHTMLData.Url.Path + "' width='100%' height='250px' frameborder='0'></iframe>";
-                            return sIframe;
-                        }
-                    });
+        if (index >= 0) {
+            if (aAllFacets[index].bLoaded && !aAllFacets[index].bProcessed && aAllFacets[index].Links) {
+                aLinks = aAllFacets[index].Links;
+                for (let j = 0; j < aLinks.length; ++j) {
+                    if (aAllFacets[index].bIsTable === false) {
+                        aLinks[j].oVL.getContent()[1].setText(aLinks[j].oVL.getContent()[0].getText());
+                    }
                 }
-                return oHTMLCtrl;
+            }
         }
-    };
+    }
 
-    var itemListFactory = function (oModel, aColumns, sEntityType, oMetadata, sBindingPath, oSelectedFacet, oPropertyExtensions, oFacet) {
-        var aLabels = [], aControls = [], cells = [], columns = [], aSortItems = [], aFilterItems = [], bEnableSortFilterDialog = false,
-            i, k, aPropertyExtensions, iMaxColumns, iPrioHighColumnCount, iPrioMediumColumnCount, oImportance, oLabel, bVisible,
-            oControl, oTemplateData, sTitle, oTable, oSortItem, oVSDialog, sColumnName, oFilterItem, oCustomFilterControl,
-            oSuiteUiCommonsResourceBundle, bSortable, sConcatColumnName;
-        oSuiteUiCommonsResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.suite.ui.commons");
+    function itemListFactory (oModel, aColumns, sEntityType, oMetadata, sBindingPath, oSelectedFacet, oPropertyExtensions, oFacet) {
+        const aLabels = [];
+        const aControls = [];
+        const cells = [];
+        const columns = [];
+        const aSortItems = [];
+        const aFilterItems = [];
+        let bEnableSortFilterDialog = false;
+        let iMaxColumns;
+        let iPrioHighColumnCount;
+        let iPrioMediumColumnCount;
+        let oImportance;
+        let oLabel;
+        let bVisible;
+        let oControl;
+        let sTitle;
+        let oSortItem;
+        let sColumnName;
+        let oFilterItem;
+        let oCustomFilterControl;
+        let bSortable;
+        let sConcatColumnName;
+        const oSuiteUiCommonsResourceBundle = Core.getLibraryResourceBundle("sap.suite.ui.commons");
         if (!oMetadata) {
             oMetadata = oModel.getServiceMetadata();
         }
-        aPropertyExtensions = (oMapping.propertyExtensions) ? oMapping.propertyExtensions[sEntityType] : [];
-        iMaxColumns = 6; //Default value for desktop
+        const aPropertyExtensions = (oMapping.propertyExtensions) ? oMapping.propertyExtensions[sEntityType] : [];
+        iMaxColumns = 6; // Default value for desktop
         if (jQuery.device.is.tablet && jQuery.device.is.landscape) {
             iMaxColumns = 5;
         } else if (jQuery.device.is.tablet && jQuery.device.is.portrait) {
@@ -1215,7 +1224,7 @@ sap.ui.define([
         }
         iPrioHighColumnCount = 0;
         iPrioMediumColumnCount = 0;
-        for (i = 0; i < aColumns.length; i += 1) {
+        for (let i = 0; i < aColumns.length; ++i) {
             oImportance = getImportanceOfRecord(aColumns[i]);
             if (oImportance === "High") {
                 iPrioHighColumnCount += 1;
@@ -1228,7 +1237,7 @@ sap.ui.define([
         }
         columns.push(new Column({ visible: false }));
         cells.push(new Text().bindText("__metadata/uri"));
-        for (i = 0; i < aColumns.length; i += 1) {
+        for (let i = 0; i < aColumns.length; ++i) {
             sConcatColumnName = "";
             oControl = new Control();
             oImportance = getImportanceOfRecord(aColumns[i]);
@@ -1263,7 +1272,7 @@ sap.ui.define([
             } else {
                 // A column consists of concatenated fields. Only if all fields are sortable, then allow a column sorting.
                 bSortable = true;
-                for (k = 0; k < aColumns[i].Value.Apply.Parameters.length; k += 1) {
+                for (let k = 0; k < aColumns[i].Value.Apply.Parameters.length; ++k) {
                     if (aColumns[i].Value.Apply.Parameters[k].Type === "Path") {
                         sColumnName = aColumns[i].Value.Apply.Parameters[k].Value;
                         // Check if column is sortable (if nothing is specified, column is sortable).
@@ -1318,7 +1327,7 @@ sap.ui.define([
             columns.push(new Column({ header: oLabel, hAlign: columnHAlign(aColumns[i]), visible: bVisible }));
             cells.push(oControl);
         }
-        oTemplateData = new ColumnListItem({
+        const oTemplateData = new ColumnListItem({
             type: ListType.Navigation,
             unread: false,
             cells: cells
@@ -1326,10 +1335,11 @@ sap.ui.define([
         if (oSelectedFacet) {
             sTitle = oSelectedFacet.Label.String;
         }
-        oTemplateData.attachPress({ aColumns: aColumns, aLabels: aLabels, aControls: aControls, sTitle: sTitle }, function (oEvent, oData) {
-            var i, sItem, oContent, oLabel, oThingGroup, oPage, oValue;
-            sItem = oEvent.getSource().getCells()[0].getText().substr(oEvent.getSource().getCells()[0].getText().lastIndexOf("/"));
-            oContent = new Table({
+        oTemplateData.attachPress({ aColumns: aColumns, aLabels: aLabels, aControls: aControls, sTitle: sTitle }, (oEvent) => {
+            let oLabel;
+            let oValue;
+            const sItem = oEvent.getSource().getCells()[0].getText().substr(oEvent.getSource().getCells()[0].getText().lastIndexOf("/"));
+            const oContent = new Table({
                 backgroundDesign: BackgroundDesign.Transparent,
                 showSeparators: ListSeparators.None,
                 columns: [
@@ -1341,29 +1351,28 @@ sap.ui.define([
             oContent.addStyleClass("sapFactsheetUtiTilePadding");
             oContent.addStyleClass("sapFactsheetUtiTableNoTopBorder");
             oContent.bindElement(sItem);
-            for (i = 0; i < aColumns.length; i += 1) {
+            for (let i = 0; i < aColumns.length; ++i) {
                 oLabel = aLabels[i].clone();
-                oLabel.setText(oLabel.getText() + ":");
+                oLabel.setText(`${oLabel.getText()}:`);
                 oValue = aControls[i].clone();
                 oLabel.setLabelFor(oValue);
                 oContent.addItem(new ColumnListItem({ cells: [oLabel, oValue] }));
             }
-            oThingGroup = new UnifiedThingGroup({
+            const oThingGroup = new UnifiedThingGroup({
                 content: oContent,
                 title: sTitle,
                 description: getTIDescription()
             });
-            oPage = new Page({
+            const oPage = new Page({
                 title: oTI.getTitle(),
                 showNavButton: true,
                 content: [oThingGroup]
             });
             oTI.navigateToPage(oPage, true);
-            //Workaround: no Link if no authority
-            oTI.attachAfterNavigate(oContent, function (oEvent) {
+            // Workaround: no Link if no authority
+            oTI.attachAfterNavigate(oContent, (oEvent) => {
                 if (oEvent.getParameters().getParameters().toId.indexOf("__page") >= 0) {
-                    var aItems;
-                    aItems = oContent.getItems();
+                    const aItems = oContent.getItems();
                     if (aItems.length > 0 && aAllFacets.indexOf(oFacet) >= 0) {
                         aAllFacets[aAllFacets.indexOf(oFacet)].bLoaded = true;
                         aAllFacets[aAllFacets.indexOf(oFacet)].bProcessed = false;
@@ -1373,24 +1382,24 @@ sap.ui.define([
                     }
                 }
             });
-            //Workaround: no Link if no authority
+            // Workaround: no Link if no authority
         });
-        oTable = new Table({ growing: true, columns: columns });
+        const oTable = new Table({ growing: true, columns: columns });
         oTable.setModel(oModel);
         oTable.bindItems({
             path: sBindingPath,
             template: oTemplateData
         });
-        var customFilterString = new VBox({
+        const customFilterString = new VBox({
             items: [
                 new Input({
                     placeholder: oSuiteUiCommonsResourceBundle.getText("USHELL_FACTSHEET_ENTER_YOUR_FILTER"),
                     change: function (oEvent) {
-                        var sParentParentId, vsd, filters, customFilter, i;
-                        sParentParentId = oEvent.getSource().getParent().getParent().getId();
-                        vsd = sap.ui.getCore().byId(sParentParentId.substr(0, sParentParentId.indexOf("-")));
-                        filters = vsd.getFilterItems();
-                        for (i = 0; i < filters.length; i += 1) {
+                        let customFilter;
+                        const sParentParentId = oEvent.getSource().getParent().getParent().getId();
+                        const vsd = Core.byId(sParentParentId.substr(0, sParentParentId.indexOf("-")));
+                        const filters = vsd.getFilterItems();
+                        for (let i = 0; i < filters.length; ++i) {
                             if (filters[i] instanceof ViewSettingsCustomItem && filters[i].getKey() === this.oParent.data("ColumnName")) {
                                 customFilter = filters[i];
                                 break;
@@ -1409,7 +1418,7 @@ sap.ui.define([
                 }).addStyleClass("sapFactsheetUtiFilterInput")
             ]
         });
-        var customFilterDecimal = new VBox({
+        const customFilterDecimal = new VBox({
             items: [
                 new List({
                     mode: ListMode.SingleSelectLeft,
@@ -1429,11 +1438,11 @@ sap.ui.define([
                 new Input({
                     placeholder: oSuiteUiCommonsResourceBundle.getText("USHELL_FACTSHEET_ENTER_YOUR_FILTER"),
                     change: function (oEvent) {
-                        var sParentParentId, vsd, filters, customFilter, i;
-                        sParentParentId = oEvent.getSource().getParent().getParent().getId();
-                        vsd = sap.ui.getCore().byId(sParentParentId.substr(0, sParentParentId.indexOf("-")));
-                        filters = vsd.getFilterItems();
-                        for (i = 0; i < filters.length; i += 1) {
+                        let customFilter;
+                        const sParentParentId = oEvent.getSource().getParent().getParent().getId();
+                        const vsd = Core.byId(sParentParentId.substr(0, sParentParentId.indexOf("-")));
+                        const filters = vsd.getFilterItems();
+                        for (let i = 0; i < filters.length; ++i) {
                             if ((filters[i] instanceof ViewSettingsCustomItem) && (filters[i].getKey() === this.oParent.data("ColumnName"))) {
                                 customFilter = filters[i];
                                 break;
@@ -1477,11 +1486,11 @@ sap.ui.define([
                     valueFormat: new DateTime({ pattern: "yyyy/MM/dd HH:mm:ss UTC+00:00" }).getOutputPattern(),
                     placeholder: oSuiteUiCommonsResourceBundle.getText("USHELL_FACTSHEET_ENTER_YOUR_FILTER"),
                     change: function (oEvent) {
-                        var sParentParentId, vsd, filters, customFilter, i;
-                        sParentParentId = oEvent.getSource().getParent().getParent().getId();
-                        vsd = sap.ui.getCore().byId(sParentParentId.substr(0, sParentParentId.indexOf("-")));
-                        filters = vsd.getFilterItems();
-                        for (i = 0; i < filters.length; i += 1) {
+                        let customFilter;
+                        const sParentParentId = oEvent.getSource().getParent().getParent().getId();
+                        const vsd = Core.byId(sParentParentId.substr(0, sParentParentId.indexOf("-")));
+                        const filters = vsd.getFilterItems();
+                        for (let i = 0; i < filters.length; ++i) {
                             if ((filters[i] instanceof ViewSettingsCustomItem) && (filters[i].getKey() === this.oParent.data("ColumnName"))) {
                                 customFilter = filters[i];
                                 break;
@@ -1499,19 +1508,22 @@ sap.ui.define([
             ]
         });
 
-        var customFilterCallback = function (oControl) {
-            var aFilters = [], aItems = oControl.getItems(), i, sFilterOperator, sFilterValue;
+        function customFilterCallback (oControl) {
+            const aFilters = [];
+            const aItems = oControl.getItems();
+            let sFilterOperator;
+            let sFilterValue;
             if (aItems[0].getParent().data("EdmType") === "Edm.String" && aItems[0].getValue()) {
                 aFilters.push(new Filter(aItems[0].getParent().data("ColumnName"), FilterOperator.Contains, aItems[0].getValue()));
             } else if (aItems[0].getParent().data("EdmType") === "Edm.Decimal" && aItems[1].getValue()) {
-                for (i = 0; i < aItems[0].getItems().length; i += 1) {
+                for (let i = 0; i < aItems[0].getItems().length; ++i) {
                     if (aItems[0].getItems()[i].getSelected() === true) {
                         sFilterOperator = aItems[0].getItems()[i].data("FilterOperator");
                         break;
                     }
                 }
                 sFilterValue = aItems[1].getValue();
-                for (i = sFilterValue.length - 1; i > 0; i -= 1) {
+                for (let i = sFilterValue.length - 1; i > 0; --i) {
                     if (sFilterValue[i] === ",") {
                         sFilterValue = sFilterValue.replace(sFilterValue[i], ".");
                         break;
@@ -1519,7 +1531,7 @@ sap.ui.define([
                 }
                 aFilters.push(new Filter(aItems[1].getParent().data("ColumnName"), sFilterOperator, sFilterValue));
             } else if (aItems[0].getParent().data("EdmType") === "Edm.Date" && aItems[1].getValue()) {
-                for (i = 0; i < aItems[0].getItems().length; i += 1) {
+                for (let i = 0; i < aItems[0].getItems().length; ++i) {
                     if (aItems[0].getItems()[i].getSelected() === true) {
                         sFilterOperator = aItems[0].getItems()[i].data("FilterOperator");
                         break;
@@ -1530,15 +1542,17 @@ sap.ui.define([
                 aFilters.push(new Filter(aItems[0].getParent().data("ColumnName"), FilterOperator.EQ, aItems[0].getValue()));
             }
             return aFilters;
-        };
-        var customFilterReset = function (oEvent) {
-            var source = oEvent.getSource(), filters = source.getFilterItems(), i, j, customControlItems;
-            for (i = 0; i < filters.length; i += 1) {
+        }
+        function customFilterReset (oEvent) {
+            const source = oEvent.getSource();
+            const filters = source.getFilterItems();
+            let customControlItems;
+            for (let i = 0; i < filters.length; ++i) {
                 if (filters[i] && filters[i] instanceof ViewSettingsCustomItem) {
                     filters[i].setSelected(false);
                     filters[i].setFilterCount(0);
                     customControlItems = filters[i].getCustomControl().getItems();
-                    for (j = 0; j < customControlItems.length; j += 1) {
+                    for (let j = 0; j < customControlItems.length; ++j) {
                         // Clear of sap.m.Input and sap.m.DateTimeInput
                         if ((customControlItems[j] instanceof Input) || (customControlItems[j] instanceof DateTimeInput)) {
                             customControlItems[j].setValue("");
@@ -1550,9 +1564,9 @@ sap.ui.define([
                     }
                 }
             }
-        };
-        var customFilterCancel = customFilterReset;
-        for (i = 0; i < columns.length; i += 1) {
+        }
+        const customFilterCancel = customFilterReset;
+        for (let i = 0; i < columns.length; ++i) {
             if (columns[i + 1]) {
                 oLabel = aLabels[i].clone();
                 if (oLabel.getText() && (oLabel.data("IsSortable") === "true") && columns[i + 1].getVisible()) {
@@ -1590,22 +1604,27 @@ sap.ui.define([
                 }
             }
         }
-        oVSDialog = new ViewSettingsDialog({
+        const oVSDialog = new ViewSettingsDialog({
             sortItems: aSortItems,
             filterItems: aFilterItems,
             cancel: customFilterCancel,
             resetFilters: customFilterReset,
             confirm: function (evt) {
-                var aSorters = [], aPath = [], aFilters = [], aTableFilters = [],
-                    i, p, mParams, oBinding, sPath, bDescending, oCallback;
-                mParams = evt.getParameters();
-                oBinding = oTable.getBinding("items");
+                const aSorters = [];
+                let aPath = [];
+                let aFilters = [];
+                let aTableFilters = [];
+                let sPath;
+                let bDescending;
+                let oCallback;
+                const mParams = evt.getParameters();
+                const oBinding = oTable.getBinding("items");
                 if (mParams.sortItem) {
                     sPath = mParams.sortItem.getKey();
                     bDescending = mParams.sortDescending;
                     if (sPath.indexOf(";") > 0) {
                         aPath = sPath.split(";");
-                        for (i = 0; i < aPath.length; i += 1) {
+                        for (let i = 0; i < aPath.length; ++i) {
                             aSorters.push(new Sorter(aPath[i], bDescending));
                         }
                     } else if (sPath) {
@@ -1613,8 +1632,8 @@ sap.ui.define([
                     }
                     oBinding.sort(aSorters);
                 }
-                p = mParams;
-                for (i = 0; i < p.filterItems.length; i += 1) {
+                const p = mParams;
+                for (let i = 0; i < p.filterItems.length; ++i) {
                     if (p.filterItems[i] instanceof ViewSettingsCustomItem) { // custom control filter
                         oCallback = p.filterItems[i].getCustomData()[0].getValue();
                         aFilters = oCallback.apply(this, [p.filterItems[i].getCustomControl()]);
@@ -1647,42 +1666,185 @@ sap.ui.define([
                     new ToolbarSpacer(),
                     new Button({
                         icon: "sap-icon://drop-down-list",
-                        press: function (/*evt*/) {
+                        press: function (/* evt */) {
                             oVSDialog.open();
                         },
-                        tooltip: sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("P13NDIALOG_VIEW_SETTINGS")
+                        tooltip: Core.getLibraryResourceBundle("sap.m").getText("P13NDIALOG_VIEW_SETTINGS")
                     })
                 ]
             }));
         }
         // While data is loading display a loading text
-        oTable.setNoDataText(sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("PULL2REFRESH_LOADING_LONG"));
+        oTable.setNoDataText(Core.getLibraryResourceBundle("sap.m").getText("PULL2REFRESH_LOADING_LONG"));
         // When data gets updated check if there are no items and set a no data text in that case
-        var updatedFinished = (function (oFacet) {
+        const updatedFinished = (function (oFacet) {
             return function (oEvent) {
-                var aItems = this.getItems();
+                const aItems = this.getItems();
                 if (aItems.length === 0) {
                     this.setNoDataText(oSuiteUiCommonsResourceBundle.getText("FACETOVERVIEW_NO_CONTENT_TEXT"));
                 } else {
-                    this.setNoDataText(sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("PULL2REFRESH_LOADING_LONG"));
+                    this.setNoDataText(Core.getLibraryResourceBundle("sap.m").getText("PULL2REFRESH_LOADING_LONG"));
                 }
-                //Workaround: no Link if no authority
+                // Workaround: no Link if no authority
                 if (aItems.length > 0 && aAllFacets.indexOf(oFacet) >= 0) {
                     aAllFacets[aAllFacets.indexOf(oFacet)].bLoaded = true;
                     aAllFacets[aAllFacets.indexOf(oFacet)].bProcessed = false;
                     aAllFacets[aAllFacets.indexOf(oFacet)].bIsTable = true;
                     aAllFacets[aAllFacets.indexOf(oFacet)].oTableItems = aItems;
                 }
-                checkLinks(aAllFacets.indexOf(oFacet));
-                //Workaround: no Link if no authority
-            };
-        }(oFacet));
-        oTable.attachUpdateFinished(updatedFinished);
-        return oTable;
-    };
+                checkLinks(aAllFacets.indexOf(oFacet));
+                // Workaround: no Link if no authority
+            };
+        }(oFacet));
+        oTable.attachUpdateFinished(updatedFinished);
+        return oTable;
+    }
+
+    function showHTML (oHTMLData) {
+        let oImage;
+        let oHTMLCtrl;
+        let sIframe;
+        switch (oHTMLData.UrlContentType.String) {
+            case "image/png":
+            case "image/jpeg":
+            case "image/gif":
+                oImage = new Image({ width: "100%" });
+                if (oHTMLData.Url.String) {
+                    oImage.setSrc(oHTMLData.Url.String);
+                }
+                return oImage;
+            default:
+                oHTMLCtrl = new HTML();
+                if (oHTMLData.Url.String) {
+                    oHTMLCtrl.setContent(`<iframe src = '${oHTMLData.Url.String}' width='100%' height='250px' frameborder='0'></iframe>`);
+                } else if (oHTMLData.Url.Path) {
+                    oHTMLCtrl.bindProperty("content", {
+                        path: oHTMLData.Url.Path,
+                        formatter: function (/* value */) {
+                            sIframe = `<iframe src = '${oHTMLData.Url.Path}' width='100%' height='250px' frameborder='0'></iframe>`;
+                            return sIframe;
+                        }
+                    });
+                }
+                return oHTMLCtrl;
+        }
+    }
+
+    function facetFactory (oModel, sEntitySet, oSelectedFacet, sBindingPath, oFacet) {
+        let sAssociationMultiplicity = "";
+        const aTG = [];
+        let oTG;
+        let sNavPath;
+        let sAnnoPath;
+        let aAnnoPath;
+        let sNavEntitySet;
+        let oList;
+        let aIdentification;
+        let oVL;
+        let aStatusInfo;
+        let oFG;
+        let sEntityType;
+        let aColumns;
+        let oPropertyExtensions;
+        const oMetadata = oModel.getServiceMetadata();
+        switch (oSelectedFacet.RecordType) {
+            case "com.sap.vocabularies.UI.v1.ReferenceFacet":
+                oTG = new UnifiedThingGroup();
+                if (oSelectedFacet.Label && oSelectedFacet.Label.String) {
+                    oTG.setTitle(oSelectedFacet.Label.String);
+                }
+                sNavPath = oSelectedFacet.Target.AnnotationPath;
+                sAnnoPath = sNavPath.substring(sNavPath.lastIndexOf("@") + 1);
+                sNavPath = sNavPath.substring(0, sNavPath.lastIndexOf("@") - 1);
+                if (sNavPath) {
+                    sAssociationMultiplicity = getAssociationMultiplicity(sEntitySet, sNavPath, oMetadata);
+                }
+                aAnnoPath = sAnnoPath.split("#");
+                switch (aAnnoPath[0]) {
+                    case "com.sap.vocabularies.UI.v1.LineItem":
+                    case "com.sap.vocabularies.UI.v1.Chart":
+                    case "com.sap.vocabularies.UI.v1.Badge":
+                    case "com.sap.vocabularies.UI.v1.Identification":
+                        if (sNavPath) {
+                            sNavEntitySet = getNavEntitySet(sEntitySet, sNavPath, oMetadata);
+                            sEntityType = getEntityType(sNavEntitySet, oMetadata);
+                        } else {
+                            sEntityType = getEntityType(sEntitySet, oMetadata);
+                        }
+                        // In case of a chart we need to have the definition of the line items
+                        if (aAnnoPath[0] === "com.sap.vocabularies.UI.v1.Chart") {
+                            sAnnoPath = "com.sap.vocabularies.UI.v1.LineItem";
+                        }
+                        aColumns = oMapping[sEntityType][sAnnoPath];
+                        if (oMapping.propertyExtensions) {
+                            oPropertyExtensions = oMapping.propertyExtensions[sEntityType];
+                        }
+                        if (sAssociationMultiplicity === "*" && aAnnoPath[0] !== "com.sap.vocabularies.UI.v1.Identification") {
+                            oList = itemListFactory(oModel, aColumns, sEntityType, oMetadata, `${sBindingPath}/${sNavPath}`, oSelectedFacet, oPropertyExtensions, oFacet);
+                            oTG.setContent(oList);
+                        }
+                        if (aAnnoPath[0] === "com.sap.vocabularies.UI.v1.Identification") {
+                            aIdentification = oMapping[sEntityType]["com.sap.vocabularies.UI.v1.Identification"];
+                            oVL = new VerticalLayout({ width: "100%" }).setModel(oModel);
+                            if (sNavPath) {
+                                oVL.addContent(formLayoutFactory(oModel, sNavEntitySet, aIdentification, null, null, oFacet)).addStyleClass("sapFactsheetUtiPanel");
+                                oVL.bindElement(`${sBindingPath}/${sNavPath}`);
+                            } else {
+                                oVL.addContent(formLayoutFactory(oModel, sEntitySet, aIdentification, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel"));
+                            }
+                            oTG.setContent(oVL);
+                        }
+                        break;
+                    case "com.sap.vocabularies.UI.v1.StatusInfo":
+                        if (sNavPath) {
+                            sNavEntitySet = getNavEntitySet(sEntitySet, sNavPath, oMetadata);
+                            aStatusInfo = oMapping[getEntityType(sNavEntitySet, oMetadata)]["com.sap.vocabularies.UI.v1.StatusInfo"];
+                            oTG.setContent(formLayoutFactory(oModel, sNavEntitySet, aStatusInfo, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel").bindElement(`${sBindingPath}/${sNavPath}`));
+                        } else {
+                            aStatusInfo = oMapping[getEntityType(sEntitySet, oMetadata)]["com.sap.vocabularies.UI.v1.StatusInfo"];
+                            oTG.setContent(formLayoutFactory(oModel, sEntitySet, aStatusInfo, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel"));
+                        }
+                        break;
+                    case "com.sap.vocabularies.UI.v1.FieldGroup":
+                        oFG = oMapping[getEntityType(sEntitySet, oMetadata)][sAnnoPath];
+                        if (oFG) {
+                            if (!oTG.getTitle() || (oTG.getTitle() === "")) {
+                                if (oFG.Label) {
+                                    if (oFG.Label.String) {
+                                        oTG.setTitle(oFG.Label.String);
+                                    } else if (oFG.Label.Path) {
+                                        oTG.bindProperty("title", oFG.Label.Path);
+                                    }
+                                }
+                            }
+                            if (sNavPath) {
+                                sNavEntitySet = getNavEntitySet(sEntitySet, sNavPath, oMetadata);
+                                oTG.setContent(formLayoutFactory(oModel, sNavEntitySet, oFG.Data, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel").bindElement(`${sBindingPath}/${sNavPath}`));
+                            } else {
+                                oTG.setContent(formLayoutFactory(oModel, sEntitySet, oFG.Data, null, null, oFacet).addStyleClass("sapFactsheetUtiPanel"));
+                            }
+                        }
+                        break;
+                    default:
+                        break;
+                }
+                return oTG;
+            case "com.sap.vocabularies.UI.v1.ReferenceURLFacet":
+                oTG = new ThingGroup({ title: oSelectedFacet.Label.String });
+                oTG.setContent(showHTML(oSelectedFacet));
+                return oTG;
+            case "com.sap.vocabularies.UI.v1.CollectionFacet":
+                for (let i = 0; i < oSelectedFacet.Facets.length; ++i) {
+                    aTG.push(facetFactory(oModel, sEntitySet, oSelectedFacet.Facets[i], sBindingPath, oFacet));
+                }
+                return aTG;
+            default:
+                break;
+        }
+    }
 
-    var chartControlFactory = function (sChartType, oTitle, oDescription, oDataset) {
-        var oChartControl;
+    function chartControlFactory (sChartType, oTitle, oDescription, oDataset) {
+        let oChartControl;
         switch (sChartType) {
             case "com.sap.vocabularies.UI.v1.ChartType/Area":
                 oChartControl = new Area({});
@@ -1750,7 +1912,7 @@ sap.ui.define([
             oChartControl = new Text({});
         }
         return oChartControl;
-    };
+    }
 
     /**
      * Returns tile height in rem, depending on device type and number of segments the tile consists of.
@@ -1759,20 +1921,23 @@ sap.ui.define([
      *   Default value is 1.
      * @returns {string} Tile height in rem.
      */
-    var getTeaserTileHeight = function (iSegments) {
-        var iReturn;
+    function getTeaserTileHeight (iSegments) {
+        let iReturn;
         iSegments = iSegments || 1;
         if (jQuery.device.is.phone) {
-            iReturn = (7 * iSegments) + "rem";
+            iReturn = `${7 * iSegments}rem`;
         } else {
-            iReturn = (11 * iSegments - 1) + "rem";
+            iReturn = `${11 * iSegments - 1}rem`;
         }
         return iReturn;
-    };
+    }
 
-    var getFieldSumsByPriority = function (aFields) {
-        var iFieldsWithPrioHigh = 0, iFieldsWithPrioMedium = 0, iFieldsWithPrioLow = 0, i, oImportance;
-        for (i = 0; i < aFields.length; i += 1) {
+    function getFieldSumsByPriority (aFields) {
+        let iFieldsWithPrioHigh = 0;
+        let iFieldsWithPrioMedium = 0;
+        let iFieldsWithPrioLow = 0;
+        let oImportance;
+        for (let i = 0; i < aFields.length; ++i) {
             oImportance = getImportanceOfRecord(aFields[i]);
             if (oImportance) {
                 switch (oImportance) {
@@ -1789,27 +1954,14 @@ sap.ui.define([
             }
         }
         return { High: iFieldsWithPrioHigh, Medium: iFieldsWithPrioMedium, Low: iFieldsWithPrioLow };
-    };
-
-    /**
-     * Returns the importance (High, Medium, Low) of a given record.
-     * Necessary as the annotation for importance changed in OData V4 and we'd like to support both V2 and V4.
-     * @param {object} oRecord as object.
-     * @returns {string} Importance of the record (High, Medium, Low).
-     */
-    var getImportanceOfRecord = function (oRecord) {
-        var sEnumMember = "";
-        if (oRecord.Importance) {
-            sEnumMember = oRecord.Importance.EnumMember;
-        } else if (oRecord["com.sap.vocabularies.UI.v1.Importance"]) {
-            sEnumMember = oRecord["com.sap.vocabularies.UI.v1.Importance"].EnumMember;
-        }
-        return sEnumMember.substr(sEnumMember.indexOf("/") + 1);
-    };
+    }
 
-    var kpiTileFactory = function (oModel, aDataPoint, sEntityType, sBindingPath) {
-        var bIsNumeric = false, oTile, fractionDigits, oBinding, oBindingInfo;
-        oTile = new KpiTile({
+    function kpiTileFactory (oModel, aDataPoint, sEntityType, sBindingPath) {
+        let bIsNumeric = false;
+        let fractionDigits;
+        let oBinding;
+        let oBindingInfo;
+        const oTile = new KpiTile({
             doubleFontSize: false
         });
         // Set ValueFormat
@@ -1871,15 +2023,33 @@ sap.ui.define([
             oTile.setDoubleFontSize(true);
         }
         return oTile;
-    };
+    }
+
+    // Workaround: no Link if no authority
+    function getSemObjectsFromAnnotation (oMetadata) {
+        const aRelatedObjects = [];
+        const aRelObjToProcess = [];
+        let sSemanticObject;
+        let key;
+
+        function collectSemanticObject (oObject) {
+            if (oObject.RecordType && oObject.RecordType === "com.sap.vocabularies.UI.v1.DataFieldWithUrl") {
+                if (oObject.Url && oObject.Url.Apply) {
+                    sSemanticObject = oObject.Url.Apply.Parameters[0].Value.slice(oObject.Url.Apply.Parameters[0].Value.indexOf("#") + 1, oObject.Url.Apply.Parameters[0].Value.indexOf("-"));
+                    if (aRelatedObjects.indexOf(sSemanticObject) < 0) {
+                        aRelatedObjects.push(sSemanticObject);
+                    }
+                    return true;
+                }
+            } else {
+                return false;
+            }
+        }
 
-    //Workaround: no Link if no authority
-    var getSemObjectsFromAnnotation = function (oMetadata) {
-        var aRelatedObjects = [], aRelObjToProcess = [], sSemanticObject, i, key;
-        var getSemanticObjects = function (oObject) {
+        function getSemanticObjects (oObject) {
             if (collectSemanticObject(oObject) === false) {
                 if (Array.isArray(oObject)) {
-                    for (i = 0; i < oObject.length; i += 1) {
+                    for (let i = 0; i < oObject.length; ++i) {
                         collectSemanticObject(oObject[i]);
                     }
                 } else if (typeof oObject === "object") {
@@ -1892,20 +2062,8 @@ sap.ui.define([
                     }
                 }
             }
-        };
-        var collectSemanticObject = function (oObject) {
-            if (oObject.RecordType && oObject.RecordType === "com.sap.vocabularies.UI.v1.DataFieldWithUrl") {
-                if (oObject.Url && oObject.Url.Apply) {
-                    sSemanticObject = oObject.Url.Apply.Parameters[0].Value.slice(oObject.Url.Apply.Parameters[0].Value.indexOf("#") + 1, oObject.Url.Apply.Parameters[0].Value.indexOf("-"));
-                    if (aRelatedObjects.indexOf(sSemanticObject) < 0) {
-                        aRelatedObjects.push(sSemanticObject);
-                    }
-                    return true;
-                }
-            } else {
-                return false;
-            }
-        };
+        }
+
         for (key in oMapping) {
             if (oMapping.hasOwnProperty(key)) {
                 if (key.indexOf(oMetadata.dataServices.schema[0].namespace) >= 0) {
@@ -1913,37 +2071,40 @@ sap.ui.define([
                 }
             }
         }
-        for (i = 0; i < aRelatedObjects.length; i += 1) {
+        for (let i = 0; i < aRelatedObjects.length; ++i) {
             if (!oLinkAuthorised.hasOwnProperty(aRelatedObjects[i])) {
                 aRelObjToProcess.push(aRelatedObjects[i]);
             }
         }
         return aRelObjToProcess;
-    };
+    }
 
-    var callInteropService = function (aRelObjToProcess) {
-        var i, oJSONModel, sLink, sFilter;
+    function callInteropService (aRelObjToProcess) {
+        let oJSONModel;
+        let sLink;
+        let sFilter;
         if (aRelObjToProcess.length > 0) {
             oJSONModel = new JSONModel();
             sLink = "/sap/opu/odata/UI2/INTEROP/SemanticObjects?$expand=Links&$format=json";
             sFilter = "&$filter=id%20eq%20%27";
-            for (i = 0; i < aRelObjToProcess.length; i += 1) {
+            for (let i = 0; i < aRelObjToProcess.length; ++i) {
                 if (sFilter.length > 22) {
-                    sFilter += "%20or%20id%20eq%20%27" + aRelObjToProcess[i] + "%27";
+                    sFilter += `%20or%20id%20eq%20%27${aRelObjToProcess[i]}%27`;
                 } else {
-                    sFilter += aRelObjToProcess[i] + "%27";
+                    sFilter += `${aRelObjToProcess[i]}%27`;
                 }
             }
             sLink += sLink + sFilter;
             oJSONModel.loadData(sLink);
             oJSONModel.attachRequestCompleted(function () {
-                var aLinks = [], i, j, types;
+                let aLinks = [];
+                let types;
                 if (this.getData().d && this.getData().d.results) {
                     types = this.getData().d.results;
-                    for (i = 0; i < types.length; i += 1) {
+                    for (let i = 0; i < types.length; ++i) {
                         oLinkAuthorised[types[i].id] = "";
                         aLinks = types[i].Links.results;
-                        for (j = 0; j < aLinks.length; j += 1) {
+                        for (let j = 0; j < aLinks.length; ++j) {
                             oLinkAuthorised[aLinks[j].id.slice(0, aLinks[j].id.indexOf("~"))] = "";
                         }
                     }
@@ -1954,96 +2115,82 @@ sap.ui.define([
         } else {
             oLinkAuthorised.InteropCompleted = true;
         }
-    };
-
-    var checkLinks = function (index) {
-        var i, j, k, n, aItems, aCells, aLinks;
-        if (oLinkAuthorised.InteropCompleted === true) {
-            for (i = 0; i < aAllFacets.length; i += 1) {
-                if (aAllFacets[i].bLoaded && !aAllFacets[i].bProcessed && aAllFacets[i].Links) {
-                    aLinks = aAllFacets[i].Links;
-                    for (j = 0; j < aLinks.length; j += 1) {
-                        if (oLinkAuthorised.hasOwnProperty(aLinks[j].sIntend) === true) {
-                            if (aAllFacets[i].bIsTable === true) {
-                                if (aAllFacets[i].oTableItems) {
-                                    aItems = aAllFacets[i].oTableItems;
-                                    for (k = 0; k < aItems.length; k += 1) {
-                                        aCells = aItems[k].getCells();
-                                        for (n = 0; n < aCells.length; n += 1) {
-                                            if (aCells[n] instanceof VerticalLayout &&
-                                                aCells[n].getContent()[0].getBindingInfo("href").parts === aLinks[j].oVL.getContent()[0].getBindingInfo("href").parts &&
-                                                aCells[n].getContent()[1].getBindingInfo("text").parts === aLinks[j].oVL.getContent()[1].getBindingInfo("text").parts) {
-                                                aCells[n].getContent()[0].setVisible(true);
-                                                aCells[n].getContent()[1].setVisible(false);
-                                            }
-                                        }
-                                    }
-                                }
-                            } else {
-                                aLinks[j].oVL.getContent()[0].setVisible(true);
-                                aLinks[j].oVL.getContent()[1].setVisible(false);
-                            }
-                        } else if (aAllFacets[i].bIsTable === false) {
-                            aLinks[j].oVL.getContent()[1].setText(aLinks[j].oVL.getContent()[0].getText());
-                        }
-                        aAllFacets[i].bProcessed = true;
-                    }
-                }
-            }
-        }
-        if (index >= 0) {
-            if (aAllFacets[index].bLoaded && !aAllFacets[index].bProcessed && aAllFacets[index].Links) {
-                aLinks = aAllFacets[index].Links;
-                for (j = 0; j < aLinks.length; j += 1) {
-                    if (aAllFacets[index].bIsTable === false) {
-                        aLinks[j].oVL.getContent()[1].setText(aLinks[j].oVL.getContent()[0].getText());
-                    }
-                }
-            }
-        }
-    };
-    //Workaround: no Link if no authority
-
-    var thingInspectorFactory = function (sUri, sAnnotationUri, oTI) {
-        var oContent = {}, aOperations = [], iFieldsWithPrioHigh = 0, iFieldsWithPrioMedium = 0, numKpiTiles = 0,
-            i, j, sService, oModel, sEntitySet, sBindingPath, oMetadata, sEntityType, oHeaderInfo, aFacets, sNavPath, functionParameters,
-            sBusinessParams, oGeneralFacet, oLinks, oTransactionSheet, oActionSheet, sAnnotationUriPath, sAnnotationUriAppAndFilename,
-            oSapSuiteRb, iMaxItemsInGeneral, sUseTerm, sNavEntitySet, sEntitySetForFacet, sNavEntityType, sEntityTypeForFacet, aFacetContent,
-            oImportance, sBatchPath, iFreeSpaceBuffer, aContent, oFieldSumsByPriority, iFieldsOnOverview, oFormLayout, sGeneralTileHeight,
-            oAddBookmarkButton, iRowSpan, oFacet, oGeoContent, sNavType, sCardinality, parameters, oEmailBtn, key, aDataPoint, sTerm, sHeight;
-        sService = getServiceFromUri(sUri);
-        //Because of a bug in icm the bsp application name and file name must be in lower case
-        sAnnotationUriPath = sAnnotationUri.substring(0, sAnnotationUri.substring(0, sAnnotationUri.lastIndexOf("/")).lastIndexOf("/"));
-        sAnnotationUriAppAndFilename = sAnnotationUri.substring(sAnnotationUri.substring(0, sAnnotationUri.lastIndexOf("/")).lastIndexOf("/"));
-        //Transformation to lowercase can be prohibited by adding the encoded url parameter "cbn_keep_anno_case" with value "true".
+    }
+    // Workaround: no Link if no authority
+
+    function thingInspectorFactory (sUri, sAnnotationUri, oTI) {
+        let oContent = {};
+        const aOperations = [];
+        let iFieldsWithPrioHigh = 0;
+        let iFieldsWithPrioMedium = 0;
+        let numKpiTiles = 0;
+        let i;
+        let sNavPath;
+        let functionParameters;
+        let sBusinessParams;
+        let oGeneralFacet;
+        let oLinks;
+        let oTransactionSheet;
+        let oActionSheet;
+        let iMaxItemsInGeneral;
+        let sUseTerm;
+        let sNavEntitySet;
+        let sEntitySetForFacet;
+        let sNavEntityType;
+        let sEntityTypeForFacet;
+        let aFacetContent;
+        let oImportance;
+        let sBatchPath;
+        let iFreeSpaceBuffer;
+        let aContent;
+        let oFieldSumsByPriority;
+        let iFieldsOnOverview;
+        let oFormLayout;
+        let sGeneralTileHeight;
+        let iRowSpan;
+        let oFacet;
+        let oGeoContent;
+        let sNavType;
+        let sCardinality;
+        let parameters;
+        let oEmailBtn;
+        let key;
+        let aDataPoint;
+        let sTerm;
+        let sHeight;
+        const sService = getServiceFromUri(sUri);
+        // Because of a bug in icm the bsp application name and file name must be in lower case
+        const sAnnotationUriPath = sAnnotationUri.substring(0, sAnnotationUri.substring(0, sAnnotationUri.lastIndexOf("/")).lastIndexOf("/"));
+        let sAnnotationUriAppAndFilename = sAnnotationUri.substring(sAnnotationUri.substring(0, sAnnotationUri.lastIndexOf("/")).lastIndexOf("/"));
+        // Transformation to lowercase can be prohibited by adding the encoded url parameter "cbn_keep_anno_case" with value "true".
         if (window.location.search.indexOf("cbn_keep_anno_case%3Dtrue") === -1) {
             sAnnotationUriAppAndFilename = sAnnotationUriAppAndFilename.toLowerCase();
         }
-        oModel = new ODataModel(
+        const oModel = new ODataModel(
             sService,
             { annotationURI: sAnnotationUriPath + sAnnotationUriAppAndFilename, loadAnnotationsJoined: true, loadMetadataAsync: false, json: true }
         );
         oModel.setCountSupported(false);
         oTI.setModel(oModel);
-        sEntitySet = getEntitySetFromUri(sUri, oModel);
-        sBindingPath = "/" + sUri.slice(sService.length);
-        oMetadata = oModel.getServiceMetadata();
+        const sEntitySet = getEntitySetFromUri(sUri, oModel);
+        const sBindingPath = `/${sUri.slice(sService.length)}`;
+        const oMetadata = oModel.getServiceMetadata();
         oMapping = oModel.getServiceAnnotations();
-        sEntityType = getEntityType(sEntitySet, oMetadata);
-        oHeaderInfo = oMapping[sEntityType]["com.sap.vocabularies.UI.v1.HeaderInfo"];
-        aFacets = oMapping[sEntityType]["com.sap.vocabularies.UI.v1.Facets"];
+        const sEntityType = getEntityType(sEntitySet, oMetadata);
+        const oHeaderInfo = oMapping[sEntityType]["com.sap.vocabularies.UI.v1.HeaderInfo"];
+        const aFacets = oMapping[sEntityType]["com.sap.vocabularies.UI.v1.Facets"];
         oTI.bindElement(sBindingPath, getExpand(sEntitySet, oMetadata));
-        oSapSuiteRb = sap.ui.getCore().getLibraryResourceBundle("sap.suite.ui.commons");
+        const oSapSuiteRb = Core.getLibraryResourceBundle("sap.suite.ui.commons");
 
-        //Workaround: no Link if no authority
+        // Workaround: no Link if no authority
         oLinkAuthorised.InteropCompleted = false;
         callInteropService(getSemObjectsFromAnnotation(oMetadata));
-        //Workaround: no Link if no authority
+        // Workaround: no Link if no authority
 
         // Begin of rendering
 
         // Add a business object specific style class for branding
-        oTI.addStyleClass("sapFactsheetUtiThingType" + sEntitySet.replace(/\s/g, ""));
+        oTI.addStyleClass(`sapFactsheetUtiThingType${sEntitySet.replace(/\s/g, "")}`);
 
         // Factsheet title e. g. "Article", "Sales Order", etc.
         if (oHeaderInfo.TypeName.String) {
@@ -2095,7 +2242,7 @@ sap.ui.define([
         }
 
         // General facet
-        for (i = 0; i < aFacets.length; i += 1) {
+        for (let i = 0; i < aFacets.length; ++i) {
             if (aFacets[i]["com.sap.vocabularies.UI.v1.IsSummary"]) {
                 oGeneralFacet = aFacets[i];
                 break;
@@ -2103,7 +2250,7 @@ sap.ui.define([
         }
         if (oGeneralFacet) {
             iMaxItemsInGeneral = 15;
-            for (j = 0; j < oGeneralFacet.Facets.length; j += 1) {
+            for (let j = 0; j < oGeneralFacet.Facets.length; ++j) {
                 sUseTerm = oGeneralFacet.Facets[j].Target.AnnotationPath.substring(oGeneralFacet.Facets[j].Target.AnnotationPath.lastIndexOf("@") + 1);
                 sNavPath = oGeneralFacet.Facets[j].Target.AnnotationPath;
                 sNavPath = sNavPath.substring(0, sNavPath.lastIndexOf("@") - 1);
@@ -2130,7 +2277,7 @@ sap.ui.define([
                     aFacetContent = oMapping[sEntityTypeForFacet][sUseTerm].Data;
                 }
                 oGeneralFacet.Facets[j].Content = aFacetContent;
-                for (i = 0; i < aFacetContent.length; i += 1) {
+                for (let i = 0; i < aFacetContent.length; ++i) {
                     oImportance = getImportanceOfRecord(aFacetContent[i]);
                     if (oImportance === "High") {
                         iFieldsWithPrioHigh += 1;
@@ -2163,7 +2310,7 @@ sap.ui.define([
             aAllFacets[0].bIsTable = false;
             aContent = [];
             iFieldsOnOverview = iFieldsWithPrioMedium + iFieldsWithPrioHigh;
-            for (j = 0; j < oGeneralFacet.Facets.length; j += 1) {
+            for (let j = 0; j < oGeneralFacet.Facets.length; ++j) {
                 oFormLayout = formLayoutFactory(oModel, oGeneralFacet.Facets[j].EntitySet, oGeneralFacet.Facets[j].Content, {
                     High: iFieldsWithPrioHigh,
                     Medium: iFieldsWithPrioMedium,
@@ -2173,7 +2320,7 @@ sap.ui.define([
                     oFormLayout.addStyleClass("sapFactsheetUtiPaddingTop");
                 }
                 if (oGeneralFacet.Facets[j].NavPath) {
-                    oFormLayout.bindElement(sBindingPath + "/" + oGeneralFacet.Facets[j].NavPath);
+                    oFormLayout.bindElement(`${sBindingPath}/${oGeneralFacet.Facets[j].NavPath}`);
                 }
                 oFieldSumsByPriority = getFieldSumsByPriority(oGeneralFacet.Facets[j].Content);
                 iFieldsWithPrioHigh -= oFieldSumsByPriority.High;
@@ -2187,11 +2334,11 @@ sap.ui.define([
                     */
                     if (j > 0) {
                         if (iFreeSpaceBuffer > 0) {
-                            iFreeSpaceBuffer -= 1;
+                            --iFreeSpaceBuffer;
                         } else if (iFieldsWithPrioMedium > 0) {
-                            iFieldsWithPrioMedium -= 1;
+                            --iFieldsWithPrioMedium;
                         } else if (iFieldsWithPrioHigh > 0) {
-                            iFieldsWithPrioHigh -= 1;
+                            --iFieldsWithPrioHigh;
                         }
                     }
                 }
@@ -2224,9 +2371,11 @@ sap.ui.define([
             }
             oFacet.addStyleClass("sapFactsheetUtiGeneralInformationOverviewFacet");
             oFacet.attachPress({ facets: oGeneralFacet }, function (oEvent, oData) {
-                var sDefaultSpan, oGrid, oTG, oVL, oContent;
+                let sDefaultSpan;
+                let oGrid;
+                let oContent;
                 oTI.removeAllFacetContent();
-                oTG = new UnifiedThingGroup();
+                const oTG = new UnifiedThingGroup();
                 oTG.setDescription(getTIDescription());
                 oTG.setTitle(oSapSuiteRb.getText("UNIFIEDTHINGINSPECTOR_GENERAL_INFORMATION_HEADER_TEXT"));
                 oTG.addStyleClass("sapFactsheetUtiGeneralInformationUtg");
@@ -2236,8 +2385,8 @@ sap.ui.define([
                     sDefaultSpan = "L12 M12 S12";
                 }
                 aAllFacets[0].Links = [];
-                oVL = new VerticalLayout({ width: "100%" });
-                for (i = 0; i < oData.facets.Facets.length; i += 1) {
+                const oVL = new VerticalLayout({ width: "100%" });
+                for (let i = 0; i < oData.facets.Facets.length; ++i) {
                     if (i % 2 === 0) {
                         oGrid = new Grid({
                             hSpacing: 1,
@@ -2255,12 +2404,12 @@ sap.ui.define([
                         oVL.addContent(oGrid);
                     }
                 }
-                //Workaround: no Link if no authority
+                // Workaround: no Link if no authority
                 aAllFacets[0].bLoaded = true;
                 aAllFacets[0].bProcessed = false;
                 aAllFacets[0].bIsTable = false;
                 checkLinks(0);
-                //Workaround: no Link if no authority
+                // Workaround: no Link if no authority
                 if (i % 2 !== 0) {
                     oVL.addContent(oGrid);
                 }
@@ -2272,10 +2421,295 @@ sap.ui.define([
         }
 
         // Callback method of the oData reads for the geofacet
-        var oDataReadCallbackGeo = function (functionParameters) {
+        function oDataReadCallbackGeo (functionParameters) {
             return function (data) {
-                var i, oGeoModel, oGeoLocation, sPos, oNewFlags, oJsonModel, sBindingPath, oContentAddress, oHeaderInfoGeo,
-                    oIdentificationGeo, oContentTitle, oContentDescription, oContentDetail, sCaption, iCount;
+                let oGeoModel;
+                let oGeoLocation;
+                let sPos;
+                let oNewFlags;
+                let oJsonModel;
+                let sBindingPath;
+                let oContentAddress;
+                let oHeaderInfoGeo;
+                let oIdentificationGeo;
+                let oContentTitle;
+                let oContentDescription;
+                let oContentDetail;
+                let sCaption;
+                let iCount;
+
+                function submitListener (oEvent) {
+                    let sSpot;
+                    let oPopupJSON;
+                    let popUpHeight;
+                    let popUpWidth;
+                    // Get the Spot on which was clicked
+                    const oEventJSON = JSON.parse(oEvent.getParameters().data);
+                    if (oEventJSON.Action.name === "DETAIL_REQUEST" && oEventJSON.Action.instance) {
+                        sSpot = oEventJSON.Action.instance;
+                        // Parse index of clicked Spot
+                        if (oJsonModel.oData.results) {
+                            sBindingPath = `/results/${sSpot.split(".")[1]}`;
+                        }
+                        sCaption = oHeaderInfoGeo.TypeName.String.substring(0, 17); // caption must not be to long!
+                        // Create JSON for Pop-Up
+                        popUpHeight = parseFloat(getTeaserTileHeight(0.7)) * 16; // popup does not support rem -> do crude conversion
+                        popUpWidth = parseFloat(getTeaserTileHeight(1.5)) * 16;
+                        oPopupJSON = {
+                            SAPVB: {
+                                version: "2.0",
+                                "xmlns:VB": "VB",
+                                Windows: {
+                                    Remove: { name: "Detail1" },
+                                    Set: {
+                                        name: "Detail1",
+                                        Window: {
+                                            id: "Detail1",
+                                            type: "callout",
+                                            refParent: "Main",
+                                            refScene: "",
+                                            offsetX: "16",
+                                            offsetY: "-27",
+                                            modal: "false",
+                                            width: popUpWidth,
+                                            height: popUpHeight,
+                                            caption: sCaption,
+                                            "pos.bind": `${sSpot}.GeoPosition`
+                                        }
+                                    }
+                                },
+                                Scenes: {
+                                    Set: {
+                                        name: "Details",
+                                        Scene: {
+                                            id: "Details",
+                                            navControlVisible: "false"
+                                        }
+                                    }
+                                }
+                            }
+                        };
+                        this.load(oPopupJSON);
+                    }
+                }
+                function openWindowListener (oEvent) {
+                    let key;
+                    let sNavEntitySet;
+                    let iMaxFields;
+                    if (!oContentTitle) {
+                        // Content of Pop-Up doesn't exist yet.
+                        // Get title and description of Pop-Up from HeaderInfo Term
+                        oContentTitle = dataField(oHeaderInfoGeo.Title, functionParameters.navigationType, oMetadata, functionParameters.facet);
+                        oContentTitle.setModel(oJsonModel);
+                        oContentTitle.bindElement(sBindingPath);
+                        oContentDescription = dataField(oHeaderInfoGeo.Description, functionParameters.navigationType, oMetadata, functionParameters.facet);
+                        oContentDescription.setModel(oJsonModel);
+                        oContentDescription.bindElement(sBindingPath);
+                        // Get formatted address from property "label"
+                        for (key in oGeoLocation.Address) {
+                            if (key === "label") {
+                                oContentAddress = dataField({ Value: oGeoLocation.Address[key] }, functionParameters.navigationType, oMetadata, functionParameters.facet);
+                                oContentAddress.setModel(oJsonModel);
+                                oContentAddress.bindElement(sBindingPath);
+                                break;
+                            }
+                        }
+                        // Calculate maximal number of displayed high fields depending on device
+                        iMaxFields = 7; // Default value for desktop
+                        if (jQuery.device.is.tablet && jQuery.device.is.landscape) {
+                            iMaxFields = 4;
+                        } else if (jQuery.device.is.tablet && jQuery.device.is.portrait) {
+                            iMaxFields = 5;
+                        } else if (jQuery.device.is.phone && jQuery.device.is.landscape) {
+                            iMaxFields = 2;
+                        } else if (jQuery.device.is.phone && jQuery.device.is.portrait) {
+                            iMaxFields = 3;
+                        }
+                        // Create a content for the additional fields with maximally 7 prio high field from Identification Term
+                        oContentDetail = new VerticalLayout({ width: "100%" }).setModel(oModel);
+                        if (functionParameters.navigationPath) {
+                            // GeoData is on subnode
+                            sNavEntitySet = getNavEntitySet(functionParameters.entitySet, functionParameters.navigationPath, oMetadata);
+                            oContentDetail.addContent(formLayoutFactory(oModel, sNavEntitySet, oIdentificationGeo, { High: iMaxFields }, null, functionParameters.facet));
+                            oContentDetail.setModel(oJsonModel).bindElement(sBindingPath);
+                        } else {
+                            // GeoData is on root node
+                            oContentDetail.addContent(formLayoutFactory(oModel, functionParameters.entitySet, oIdentificationGeo,
+                                { High: iMaxFields }, null, functionParameters.facet)).setModel(oJsonModel).bindElement(sBindingPath);
+                        }
+                    } else {
+                        // Content of Pop-Up exists, rebind elements
+                        oContentTitle.bindElement(sBindingPath);
+                        if (oContentDescription) {
+                            oContentDescription.bindElement(sBindingPath);
+                        }
+                        if (oContentAddress) {
+                            oContentAddress.bindElement(sBindingPath);
+                        }
+                        if (oContentDetail) {
+                            oContentDetail.bindElement(sBindingPath);
+                        }
+                    }
+                    const sPopUpWidth = `${parseFloat(getTeaserTileHeight(1.5)) * 16 * 0.95}px`; // Popup does not support rem -> do crude conversion
+                    if (oContentTitle) {
+                        oContentTitle.placeAt(oEvent.getParameter("contentarea").id);
+                        oContentTitle.addStyleClass("sapFactsheetUtiGeoPopupHead");
+                        if (jQuery.device.is.phone) {
+                            oContentTitle.addStyleClass("sapFactsheetUtiGeoPopupHeadFontPhone");
+                        }
+                        oContentTitle.setWidth(sPopUpWidth);
+                    }
+                    if (oContentDescription) {
+                        oContentDescription.placeAt(oEvent.getParameter("contentarea").id);
+                        oContentDescription.addStyleClass("sapFactsheetUtiGeoPopupDescr");
+                        if (jQuery.device.is.phone) {
+                            oContentDescription.addStyleClass("sapFactsheetUtiGeoPopupDescrFontPhone");
+                        }
+                        oContentDescription.setWidth(sPopUpWidth);
+                    }
+                    if (oContentAddress) {
+                        oContentAddress.placeAt(oEvent.getParameter("contentarea").id);
+                        oContentAddress.addStyleClass("sapFactsheetUtiGeoPopupText");
+                        oContentAddress.setWidth(sPopUpWidth);
+                    }
+                    // If no Content available then don't show the control with "No Data"
+                    if (oContentDetail && oContentDetail.getContent()[0] && oContentDetail.getContent()[0].getContent
+                        && oContentDetail.getContent()[0].getContent().length > 0) {
+                        oContentDetail.placeAt(oEvent.getParameter("contentarea").id);
+                        oContentDetail.addStyleClass("sapFactsheetUtiGeoPopupText");
+                        oContentDetail.setWidth(sPopUpWidth);
+                    }
+                    // Workaround: no Link if no authority
+                    if (aAllFacets.indexOf(functionParameters.facet) >= 0) {
+                        aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bLoaded = true;
+                        aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bProcessed = false;
+                        aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bIsTable = false;
+                    }
+                    checkLinks(aAllFacets.indexOf(functionParameters.facet));
+                    // Workaround: no Link if no authority
+                }
+                function closeWindowListener (oEvent) {
+                    if (oContentTitle) {
+                        oContentTitle.destroy();
+                        oContentTitle = undefined;
+                    }
+                    if (oContentDescription) {
+                        oContentDescription.destroy();
+                        oContentDescription = undefined;
+                    }
+                    if (oContentAddress) {
+                        oContentAddress.destroy();
+                        oContentAddress = undefined;
+                    }
+                    if (oContentDetail) {
+                        oContentDetail.destroy();
+                        oContentDetail = undefined;
+                    }
+                    jQuery(oEvent.getParameter("contentarea").id).empty();
+                }
+                function processGeoApplication (functionParameters) {
+                    return function (data) {
+                        let oGeoContentDetail;
+                        let oTG;
+                        let sJSON;
+                        sJSON = data.ProjectJSON;
+                        sJSON = sJSON.indexOf("{") ? sJSON.substr(sJSON.indexOf("{")) : sJSON; // Workaround: to get rid of a BOM character at the first position
+                        const oGeoJSON = JSON.parse(sJSON);
+                        oGeoJSON.SAPVB.Scenes.Set.SceneGeo.initialStartPosition = sPos;
+                        oGeoJSON.SAPVB.Scenes.Set.SceneGeo.initialZoom = 12;
+                        // Register click/touch event on map
+                        oGeoJSON.SAPVB.Actions.Set.Action.push({
+                            id: "200",
+                            name: "TAP_ON_MAP",
+                            refEvent: "Click",
+                            refScene: "MainScene",
+                            refVO: "Map"
+                        });
+                        if (oNewFlags) {
+                            oGeoJSON.SAPVB.Data = oNewFlags.Data;
+                        }
+                        // Workaround: for the Spots set the scale attribute to a vector (x,y,z)
+                        for (let i = 0; i < oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO.length; ++i) {
+                            if (oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO[i].datasource === "Spots") {
+                                if (oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO[i].scale && oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO[i].scale.split(";").length !== 3) {
+                                    oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO[i].scale = "1.0;1.0;1.0";
+                                    break;
+                                }
+                            }
+                        }
+                        // listen to click/touch event on map on the overview tile
+                        functionParameters.facet.getContent().attachSubmit((/* oEvent */) => {
+                            // Workaround for mobile devices
+                            // fire Press event if any action is done (touch/tap/zoom) on map on overview tile
+                            if (jQuery.device.is.tablet || jQuery.device.is.phone) {
+                                functionParameters.facet.firePress();
+                            }
+                        });
+                        functionParameters.facet.getContent().load(oGeoJSON);
+                        functionParameters.facet.attachPress("", (/* oEvent, oData */) => {
+                            const aLong = [];
+                            const aLat = [];
+                            let newHeight;
+                            // Create GeoMap content
+                            if (!oGeoContentDetail) {
+                                oGeoContentDetail = new VBI({
+                                    width: "100%",
+                                    height: "100%",
+                                    plugin: false,
+                                    config: null
+                                });
+                                oGeoContentDetail.addStyleClass("sapFactsheetUtiGeoPopup");
+                            }
+                            oGeoJSON.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement.move = "false";
+                            oGeoJSON.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement.zoom = "false";
+                            oGeoJSON.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement.pitch = "false";
+                            oGeoJSON.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement.yaw = "false";
+                            oGeoJSON.SAPVB.Scenes.Set.SceneGeo.SuppressedNavControlVisibility = "false";
+                            oGeoContentDetail.load(oGeoJSON);
+                            // Collect longitude and latitude data of all locations
+                            if (functionParameters.cardinality === "*") {
+                                for (let i = 0; i < oJsonModel.oData.results.length; ++i) {
+                                    aLong.push(oJsonModel.oData.results[i][oGeoLocation.Longitude.Path]);
+                                    aLat.push(oJsonModel.oData.results[i][oGeoLocation.Latitude.Path]);
+                                }
+                            }
+                            oGeoContentDetail.attachSubmit(submitListener);
+                            oGeoContentDetail.attachOpenWindow(openWindowListener);
+                            oGeoContentDetail.attachCloseWindow(closeWindowListener);
+                            oTG = new UnifiedThingGroup({
+                                content: oGeoContentDetail,
+                                title: functionParameters.facetContent.Label.String,
+                                description: getTIDescription()
+                            });
+                            oTI.removeAllFacetContent();
+                            oTI.addFacetContent(oTG);
+                            oTI.navigateToDetail();
+                            // Workaround: UnifiedThingGroup doesn't propagate the height property to the childs, therefore we calculate the height manually
+                            oTI.attachAfterNavigate(aLong, (oEvent) => {
+                                if (oEvent.getParameters().getParameters().toId.indexOf("-detail-page") !== -1) {
+                                    // Resize map to full container size on desktop and tablet and to 300px on phone
+                                    if (jQuery.device.is.phone) {
+                                        newHeight = "300px";
+                                    } else {
+                                        newHeight = `${Math.floor(jQuery(`#${oEvent.getParameters().getParameters().toId}-cont`).height() - 128)}px`;
+                                    }
+                                    oGeoContentDetail.setHeight(newHeight);
+                                    // Zoom to show all locations
+                                    if (aLong.length > 1) {
+                                        oGeoContentDetail.zoomToGeoPosition(aLong, aLat);
+                                    }
+                                }
+                            });
+                        });
+                    };
+                }
+                function geoMapCallFailed (facet) {
+                    return function (/* error */) {
+                        // OData returns an error. Don't display the map facet.
+                        oTI.removeFacet(facet);
+                    };
+                }
+
                 if ((functionParameters.cardinality === "*" && data.results && data.results.length && data.results.length !== 0) ||
                     (functionParameters.cardinality === "1" && data)) {
                     oJsonModel = new JSONModel();
@@ -2304,19 +2738,19 @@ sap.ui.define([
                         };
                         if (functionParameters.cardinality === "1") {
                             if (oGeoLocation.Longitude.Path && oGeoLocation.Latitude.Path) {
-                                sPos = data[oGeoLocation.Longitude.Path] + ";" + data[oGeoLocation.Latitude.Path] + ";0";
+                                sPos = `${data[oGeoLocation.Longitude.Path]};${data[oGeoLocation.Latitude.Path]};0`;
                             }
                             oNewFlags.Data.Set.N[0].E.push({ A: sPos, I: "pin_blue.png" });
                         } else {
-                            for (i = 0; i < data.results.length; i += 1) {
+                            for (let i = 0; i < data.results.length; ++i) {
                                 if (oGeoLocation.Longitude.Path && oGeoLocation.Latitude.Path) {
-                                    sPos = data.results[i][oGeoLocation.Longitude.Path] + ";" + data.results[i][oGeoLocation.Latitude.Path] + ";0";
+                                    sPos = `${data.results[i][oGeoLocation.Longitude.Path]};${data.results[i][oGeoLocation.Latitude.Path]};0`;
                                 }
                                 oNewFlags.Data.Set.N[0].E.push({ A: sPos, I: "pin_blue.png" });
                             }
                             // Set to first position
                             if (data.results.length !== 0) {
-                                sPos = data.results[0][oGeoLocation.Longitude.Path] + ";" + data.results[0][oGeoLocation.Latitude.Path] + ";0";
+                                sPos = `${data.results[0][oGeoLocation.Longitude.Path]};${data.results[0][oGeoLocation.Latitude.Path]};0`;
                             }
                         }
                     }
@@ -2324,268 +2758,6 @@ sap.ui.define([
                     if (Number(iCount)) {
                         functionParameters.facet.setQuantity(iCount);
                     }
-                    var submitListener = function (oEvent) {
-                        var oEventJSON, sSpot, oPopupJSON, popUpHeight, popUpWidth;
-                        // Get the Spot on which was clicked
-                        oEventJSON = JSON.parse(oEvent.getParameters().data);
-                        if (oEventJSON.Action.name === "DETAIL_REQUEST" && oEventJSON.Action.instance) {
-                            sSpot = oEventJSON.Action.instance;
-                            // Parse index of clicked Spot
-                            if (oJsonModel.oData.results) {
-                                sBindingPath = "/results/" + sSpot.split(".")[1];
-                            }
-                            sCaption = oHeaderInfoGeo.TypeName.String.substring(0, 17); // caption must not be to long!
-                            // Create JSON for Pop-Up
-                            popUpHeight = parseFloat(getTeaserTileHeight(0.7)) * 16; // popup does not support rem -> do crude conversion
-                            popUpWidth = parseFloat(getTeaserTileHeight(1.5)) * 16;
-                            oPopupJSON = {
-                                SAPVB: {
-                                    version: "2.0",
-                                    "xmlns:VB": "VB",
-                                    Windows: {
-                                        Remove: { name: "Detail1" },
-                                        Set: {
-                                            name: "Detail1",
-                                            Window: {
-                                                id: "Detail1",
-                                                type: "callout",
-                                                refParent: "Main",
-                                                refScene: "",
-                                                offsetX: "16",
-                                                offsetY: "-27",
-                                                modal: "false",
-                                                width: popUpWidth,
-                                                height: popUpHeight,
-                                                caption: sCaption,
-                                                "pos.bind": sSpot + ".GeoPosition"
-                                            }
-                                        }
-                                    },
-                                    Scenes: {
-                                        Set: {
-                                            name: "Details",
-                                            Scene: {
-                                                id: "Details",
-                                                navControlVisible: "false"
-                                            }
-                                        }
-                                    }
-                                }
-                            };
-                            this.load(oPopupJSON);
-                        }
-                    };
-                    var openWindowListener = function (oEvent) {
-                        var key, sPopUpWidth, sNavEntitySet, iMaxFields;
-                        if (!oContentTitle) {
-                            // Content of Pop-Up doesn't exist yet.
-                            // Get title and description of Pop-Up from HeaderInfo Term
-                            oContentTitle = dataField(oHeaderInfoGeo.Title, functionParameters.navigationType, oMetadata, functionParameters.facet);
-                            oContentTitle.setModel(oJsonModel);
-                            oContentTitle.bindElement(sBindingPath);
-                            oContentDescription = dataField(oHeaderInfoGeo.Description, functionParameters.navigationType, oMetadata, functionParameters.facet);
-                            oContentDescription.setModel(oJsonModel);
-                            oContentDescription.bindElement(sBindingPath);
-                            // Get formatted address from property "label"
-                            for (key in oGeoLocation.Address) {
-                                if (key === "label") {
-                                    oContentAddress = dataField({ Value: oGeoLocation.Address[key] }, functionParameters.navigationType, oMetadata, functionParameters.facet);
-                                    oContentAddress.setModel(oJsonModel);
-                                    oContentAddress.bindElement(sBindingPath);
-                                    break;
-                                }
-                            }
-                            // Calculate maximal number of displayed high fields depending on device
-                            iMaxFields = 7; //Default value for desktop
-                            if (jQuery.device.is.tablet && jQuery.device.is.landscape) {
-                                iMaxFields = 4;
-                            } else if (jQuery.device.is.tablet && jQuery.device.is.portrait) {
-                                iMaxFields = 5;
-                            } else if (jQuery.device.is.phone && jQuery.device.is.landscape) {
-                                iMaxFields = 2;
-                            } else if (jQuery.device.is.phone && jQuery.device.is.portrait) {
-                                iMaxFields = 3;
-                            }
-                            // Create a content for the additional fields with maximally 7 prio high field from Identification Term
-                            oContentDetail = new VerticalLayout({ width: "100%" }).setModel(oModel);
-                            if (functionParameters.navigationPath) {
-                                // GeoData is on subnode
-                                sNavEntitySet = getNavEntitySet(functionParameters.entitySet, functionParameters.navigationPath, oMetadata);
-                                oContentDetail.addContent(formLayoutFactory(oModel, sNavEntitySet, oIdentificationGeo, { High: iMaxFields }, null, functionParameters.facet));
-                                oContentDetail.setModel(oJsonModel).bindElement(sBindingPath);
-                            } else {
-                                // GeoData is on root node
-                                oContentDetail.addContent(formLayoutFactory(oModel, functionParameters.entitySet, oIdentificationGeo,
-                                    { High: iMaxFields }, null, functionParameters.facet)).setModel(oJsonModel).bindElement(sBindingPath);
-                            }
-                        } else {
-                            // Content of Pop-Up exists, rebind elements
-                            oContentTitle.bindElement(sBindingPath);
-                            if (oContentDescription) {
-                                oContentDescription.bindElement(sBindingPath);
-                            }
-                            if (oContentAddress) {
-                                oContentAddress.bindElement(sBindingPath);
-                            }
-                            if (oContentDetail) {
-                                oContentDetail.bindElement(sBindingPath);
-                            }
-                        }
-                        sPopUpWidth = parseFloat(getTeaserTileHeight(1.5)) * 16 * 0.95 + "px"; // Popup does not support rem -> do crude conversion
-                        if (oContentTitle) {
-                            oContentTitle.placeAt(oEvent.getParameter("contentarea").id);
-                            oContentTitle.addStyleClass("sapFactsheetUtiGeoPopupHead");
-                            if (jQuery.device.is.phone) {
-                                oContentTitle.addStyleClass("sapFactsheetUtiGeoPopupHeadFontPhone");
-                            }
-                            oContentTitle.setWidth(sPopUpWidth);
-                        }
-                        if (oContentDescription) {
-                            oContentDescription.placeAt(oEvent.getParameter("contentarea").id);
-                            oContentDescription.addStyleClass("sapFactsheetUtiGeoPopupDescr");
-                            if (jQuery.device.is.phone) {
-                                oContentDescription.addStyleClass("sapFactsheetUtiGeoPopupDescrFontPhone");
-                            }
-                            oContentDescription.setWidth(sPopUpWidth);
-                        }
-                        if (oContentAddress) {
-                            oContentAddress.placeAt(oEvent.getParameter("contentarea").id);
-                            oContentAddress.addStyleClass("sapFactsheetUtiGeoPopupText");
-                            oContentAddress.setWidth(sPopUpWidth);
-                        }
-                        // If no Content available then don't show the control with "No Data"
-                        if (oContentDetail && oContentDetail.getContent()[0] && oContentDetail.getContent()[0].getContent
-                            && oContentDetail.getContent()[0].getContent().length > 0) {
-                            oContentDetail.placeAt(oEvent.getParameter("contentarea").id);
-                            oContentDetail.addStyleClass("sapFactsheetUtiGeoPopupText");
-                            oContentDetail.setWidth(sPopUpWidth);
-                        }
-                        //Workaround: no Link if no authority
-                        if (aAllFacets.indexOf(functionParameters.facet) >= 0) {
-                            aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bLoaded = true;
-                            aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bProcessed = false;
-                            aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bIsTable = false;
-                        }
-                        checkLinks(aAllFacets.indexOf(functionParameters.facet));
-                        //Workaround: no Link if no authority
-                    };
-                    var closeWindowListener = function (oEvent) {
-                        if (oContentTitle) {
-                            oContentTitle.destroy();
-                            oContentTitle = undefined;
-                        }
-                        if (oContentDescription) {
-                            oContentDescription.destroy();
-                            oContentDescription = undefined;
-                        }
-                        if (oContentAddress) {
-                            oContentAddress.destroy();
-                            oContentAddress = undefined;
-                        }
-                        if (oContentDetail) {
-                            oContentDetail.destroy();
-                            oContentDetail = undefined;
-                        }
-                        $(oEvent.getParameter("contentarea").id).empty();
-                    };
-                    var processGeoApplication = function (functionParameters) {
-                        return function (data) {
-                            var oGeoJSON, oGeoContentDetail, oTG, sJSON, i;
-                            sJSON = data.ProjectJSON;
-                            sJSON = sJSON.indexOf("{") ? sJSON.substr(sJSON.indexOf("{")) : sJSON; // Workaround: to get rid of a BOM character at the first position
-                            oGeoJSON = JSON.parse(sJSON);
-                            oGeoJSON.SAPVB.Scenes.Set.SceneGeo.initialStartPosition = sPos;
-                            oGeoJSON.SAPVB.Scenes.Set.SceneGeo.initialZoom = 12;
-                            // Register click/touch event on map
-                            oGeoJSON.SAPVB.Actions.Set.Action.push({
-                                id: "200",
-                                name: "TAP_ON_MAP",
-                                refEvent: "Click",
-                                refScene: "MainScene",
-                                refVO: "Map"
-                            });
-                            if (oNewFlags) {
-                                oGeoJSON.SAPVB.Data = oNewFlags.Data;
-                            }
-                            // Workaround: for the Spots set the scale attribute to a vector (x,y,z)
-                            for (i = 0; i < oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO.length; i += 1) {
-                                if (oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO[i].datasource === "Spots") {
-                                    if (oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO[i].scale && oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO[i].scale.split(";").length !== 3) {
-                                        oGeoJSON.SAPVB.Scenes.Set.SceneGeo.VO[i].scale = "1.0;1.0;1.0";
-                                        break;
-                                    }
-                                }
-                            }
-                            // listen to click/touch event on map on the overview tile
-                            functionParameters.facet.getContent().attachSubmit(function (/*oEvent*/) {
-                                // Workaround for mobile devices
-                                // fire Press event if any action is done (touch/tap/zoom) on map on overview tile
-                                if (jQuery.device.is.tablet || jQuery.device.is.phone) {
-                                    functionParameters.facet.firePress();
-                                }
-                            });
-                            functionParameters.facet.getContent().load(oGeoJSON);
-                            functionParameters.facet.attachPress("", function (/*oEvent, oData*/) {
-                                var aLong = [], aLat = [], i, newHeight;
-                                // Create GeoMap content
-                                if (!oGeoContentDetail) {
-                                    oGeoContentDetail = new VBI({
-                                        width: "100%",
-                                        height: "100%",
-                                        plugin: false,
-                                        config: null
-                                    });
-                                    oGeoContentDetail.addStyleClass("sapFactsheetUtiGeoPopup");
-                                }
-                                oGeoJSON.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement.move = "false";
-                                oGeoJSON.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement.zoom = "false";
-                                oGeoJSON.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement.pitch = "false";
-                                oGeoJSON.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement.yaw = "false";
-                                oGeoJSON.SAPVB.Scenes.Set.SceneGeo.SuppressedNavControlVisibility = "false";
-                                oGeoContentDetail.load(oGeoJSON);
-                                // Collect longitude and latitude data of all locations
-                                if (functionParameters.cardinality === "*") {
-                                    for (i = 0; i < oJsonModel.oData.results.length; i += 1) {
-                                        aLong.push(oJsonModel.oData.results[i][oGeoLocation.Longitude.Path]);
-                                        aLat.push(oJsonModel.oData.results[i][oGeoLocation.Latitude.Path]);
-                                    }
-                                }
-                                oGeoContentDetail.attachSubmit(submitListener);
-                                oGeoContentDetail.attachOpenWindow(openWindowListener);
-                                oGeoContentDetail.attachCloseWindow(closeWindowListener);
-                                oTG = new UnifiedThingGroup({
-                                    content: oGeoContentDetail,
-                                    title: functionParameters.facetContent.Label.String,
-                                    description: getTIDescription()
-                                });
-                                oTI.removeAllFacetContent();
-                                oTI.addFacetContent(oTG);
-                                oTI.navigateToDetail();
-                                // Workaround: UnifiedThingGroup doesn't propagate the height property to the childs, therefore we calculate the height manually
-                                oTI.attachAfterNavigate(aLong, function (oEvent) {
-                                    if (oEvent.getParameters().getParameters().toId.indexOf("-detail-page") !== -1) {
-                                        // Resize map to full container size on desktop and tablet and to 300px on phone
-                                        if (jQuery.device.is.phone) {
-                                            newHeight = "300px";
-                                        } else {
-                                            newHeight = Math.floor($("#" + oEvent.getParameters().getParameters().toId + "-cont").height() - 128) + "px";
-                                        }
-                                        oGeoContentDetail.setHeight(newHeight);
-                                        // Zoom to show all locations
-                                        if (aLong.length > 1) {
-                                            oGeoContentDetail.zoomToGeoPosition(aLong, aLat);
-                                        }
-                                    }
-                                });
-                            });
-                        };
-                    };
-                    var geoMapCallFailed = function (facet) {
-                        return function (/*error*/) {
-                            // OData returns an error. Don't display the map facet.
-                            oTI.removeFacet(facet);
-                        };
-                    };
                     oGeoModel.read("VBIApplicationSet('ZFACTSHEETS')", "", "", false, processGeoApplication(functionParameters), geoMapCallFailed(functionParameters.facet));
                 } else {
                     functionParameters.facet.setQuantity(undefined);
@@ -2595,21 +2767,46 @@ sap.ui.define([
                     functionParameters.facet.setTitle(undefined);
                 }
             };
-        };
+        }
 
         // Callback method of the oData reads for the further facets
-        var oDataReadCallback = function (functionParameters) {
+        function oDataReadCallback (functionParameters) {
             return function (data) {
-                var sSeparator = "",
-                    i, j, oJsonModel, oBadge, oTitle, oMainInfo, oHLayout, sSetTitle, oContent, iCount, oVLayoutForLabelValuePairs,
-                    aPropertyExtensions, oHLayoutForTitle, oTitleLabel, oHLayoutForMainInfo, oMainInfoLabel, oHLayoutForSecondaryInfo,
-                    oSecondaryInfoLabel, oSecondaryInfo, oImageUrl, oHLayoutForIconAndText, iSize, oImage, sAttribute, bResultNotEmpty,
-                    oAnnotationPath, oChart, oLabel, aDimensions, aMeasures, oDataset;
+                let sSeparator = "";
+                let oJsonModel;
+                let oBadge;
+                let oTitle;
+                let oMainInfo;
+                let oHLayout;
+                let sSetTitle;
+                let oContent;
+                let iCount;
+                let oVLayoutForLabelValuePairs;
+                let aPropertyExtensions;
+                let oHLayoutForTitle;
+                let oTitleLabel;
+                let oHLayoutForMainInfo;
+                let oMainInfoLabel;
+                let oHLayoutForSecondaryInfo;
+                let oSecondaryInfoLabel;
+                let oSecondaryInfo;
+                let oImageUrl;
+                let oHLayoutForIconAndText;
+                let iSize;
+                let oImage;
+                let sAttribute;
+                let bResultNotEmpty;
+                let oAnnotationPath;
+                let oChart;
+                let oLabel;
+                let aDimensions;
+                let aMeasures;
+                let oDataset;
                 oJsonModel = new JSONModel();
                 if (functionParameters.facetContent.Target && functionParameters.facetContent.Target.AnnotationPath
                     && functionParameters.facetContent.Target.AnnotationPath.split("#")[1]
-                    && oMapping[functionParameters.navigationType]["com.sap.vocabularies.UI.v1.Badge#" + functionParameters.facetContent.Target.AnnotationPath.split("#")[1]]) {
-                    oBadge = oMapping[functionParameters.navigationType]["com.sap.vocabularies.UI.v1.Badge#" + functionParameters.facetContent.Target.AnnotationPath.split("#")[1]];
+                    && oMapping[functionParameters.navigationType][`com.sap.vocabularies.UI.v1.Badge#${functionParameters.facetContent.Target.AnnotationPath.split("#")[1]}`]) {
+                    oBadge = oMapping[functionParameters.navigationType][`com.sap.vocabularies.UI.v1.Badge#${functionParameters.facetContent.Target.AnnotationPath.split("#")[1]}`];
                 } else {
                     oBadge = oMapping[functionParameters.navigationType]["com.sap.vocabularies.UI.v1.Badge"];
                 }
@@ -2622,19 +2819,19 @@ sap.ui.define([
                             oLabel = oMapping.propertyExtensions[functionParameters.navigationType];
                             // Collect dimensions
                             aDimensions = [];
-                            for (i = 0; i < oChart.Dimensions.length; i += 1) {
+                            for (let i = 0; i < oChart.Dimensions.length; ++i) {
                                 aDimensions.push({
                                     axis: 1,
                                     name: oLabel[oChart.Dimensions[i].PropertyPath]["http://www.sap.com/Protocols/SAPData"].label,
-                                    value: "{" + oChart.Dimensions[i].PropertyPath + "}"
+                                    value: `{${oChart.Dimensions[i].PropertyPath}}`
                                 });
                             }
                             // Collect measures
                             aMeasures = [];
-                            for (i = 0; i < oChart.Measures.length; i += 1) {
+                            for (let i = 0; i < oChart.Measures.length; ++i) {
                                 aMeasures.push({
                                     name: oLabel[oChart.Measures[i].PropertyPath]["http://www.sap.com/Protocols/SAPData"].label,
-                                    value: "{" + oChart.Measures[i].PropertyPath + "}"
+                                    value: `{${oChart.Measures[i].PropertyPath}}`
                                 });
                             }
                             oDataset = new FlattenedDataset({
@@ -2648,22 +2845,22 @@ sap.ui.define([
                             functionParameters.facet.setHeightType(jQuery.device.is.phone ? FacetOverviewHeight.Auto : FacetOverviewHeight.XL);
                         } else {
                             oContent = new VerticalLayout({ width: "100%" }).addStyleClass("sapFactsheetUtiVLayoutPadding");
-                            for (i = 0; i < data.results.length; i += 1) {
+                            for (let i = 0; i < data.results.length; ++i) {
                                 oHLayout = new HorizontalLayout().addStyleClass("sapFactsheetUtiHLayoutPadding");
                                 oTitle = dataField(oBadge.Title, functionParameters.navigationType, oMetadata, functionParameters.facet);
                                 if (oTitle.setWrapping) {
                                     oTitle.setWrapping(false);
                                 }
-                                sap.ui.getCore().byId(oTI.getId() + "-master-page").addDelegate({
+                                Core.byId(`${oTI.getId()}-master-page`).addDelegate({
                                     onAfterShow: (function (oHLayout) {
                                         return function () {
-                                            var iHorizontalLayoutWidth, iHorizontalLayoutWidthLeft;
-                                            iHorizontalLayoutWidth = oHLayout.getParent().getDomRef().clientWidth;
+                                            let iHorizontalLayoutWidthLeft;
+                                            const iHorizontalLayoutWidth = oHLayout.getParent().getDomRef().clientWidth;
                                             iHorizontalLayoutWidthLeft = iHorizontalLayoutWidth;
                                             if (oHLayout.getContent()[0]) {
                                                 iHorizontalLayoutWidthLeft -= oHLayout.getContent()[0].getDomRef().clientWidth;
                                                 if (iHorizontalLayoutWidth < oHLayout.getContent()[0].getDomRef().clientWidth) {
-                                                    oHLayout.getContent()[0].getDomRef().setAttribute("style", "width:" + iHorizontalLayoutWidth + "px");
+                                                    oHLayout.getContent()[0].getDomRef().setAttribute("style", `width:${iHorizontalLayoutWidth}px`);
                                                     return;
                                                 }
                                             }
@@ -2674,7 +2871,7 @@ sap.ui.define([
                                                 iHorizontalLayoutWidthLeft = 0;
                                             }
                                             if (oHLayout.getContent()[2]) {
-                                                oHLayout.getContent()[2].getDomRef().setAttribute("style", "width:" + iHorizontalLayoutWidthLeft + "px");
+                                                oHLayout.getContent()[2].getDomRef().setAttribute("style", `width:${iHorizontalLayoutWidthLeft}px`);
                                             }
                                         };
                                     }(oHLayout))
@@ -2688,7 +2885,7 @@ sap.ui.define([
                                     sSetTitle = true;
                                 }
                                 if (oBadge.Title.Value.Apply) {
-                                    for (j = 0; j < oBadge.Title.Value.Apply.Parameters.length; j += 1) {
+                                    for (let j = 0; j < oBadge.Title.Value.Apply.Parameters.length; ++j) {
                                         if (oBadge.Title.Value.Apply.Parameters[j].Type === "Path") {
                                             if (data.results[i][oBadge.Title.Value.Apply.Parameters[j].Value]) {
                                                 sSetTitle = true;
@@ -2711,7 +2908,7 @@ sap.ui.define([
                                         sSeparator = "dash";
                                     } else if (oBadge.MainInfo && oBadge.MainInfo.Value.Apply) {
                                         // Non decimal concatenated fields
-                                        for (j = 0; j < oBadge.MainInfo.Value.Apply.Parameters.length; j += 1) {
+                                        for (let j = 0; j < oBadge.MainInfo.Value.Apply.Parameters.length; ++j) {
                                             if (oBadge.MainInfo.Value.Apply.Parameters[j].Type === "Path") {
                                                 if (data.results[i][oBadge.MainInfo.Value.Apply.Parameters[j].Value]) {
                                                     sSeparator = "dash";
@@ -2747,20 +2944,19 @@ sap.ui.define([
                         functionParameters.facet.setContent(oContent);
 
                         functionParameters.facet.attachPress({ facet: functionParameters.facetContent }, function (oEvent, oData) {
-                            var oContent;
                             oTI.removeAllFacetContent();
                             aAllFacets[aAllFacets.indexOf(functionParameters.facet)].Links = [];
-                            oContent = facetFactory(oModel, functionParameters.entitySet, oData.facet, functionParameters.bindingPath, this);
+                            const oContent = facetFactory(oModel, functionParameters.entitySet, oData.facet, functionParameters.bindingPath, this);
                             oContent.setDescription(getTIDescription());
                             oTI.addFacetContent(oContent);
-                            //Workaround: no Link if no authority
+                            // Workaround: no Link if no authority
                             if (aAllFacets.indexOf(functionParameters.facet) >= 0) {
                                 aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bLoaded = false;
                                 aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bProcessed = false;
                                 aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bIsTable = true;
                             }
                             checkLinks(aAllFacets.indexOf(functionParameters.facet));
-                            //Workaround: no Link if no authority
+                            // Workaround: no Link if no authority
                             oTI.navigateToDetail();
                         });
                     } else {
@@ -2768,14 +2964,14 @@ sap.ui.define([
                         functionParameters.facet.addStyleClass("sapFactsheetUtiEmptyTile");
                         functionParameters.facet.setHeightType(jQuery.device.is.phone ? FacetOverviewHeight.Auto : FacetOverviewHeight.S);
                     }
-                    //Workaround: no Link if no authority
+                    // Workaround: no Link if no authority
                     if (aAllFacets.indexOf(functionParameters.facet) >= 0) {
                         aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bLoaded = true;
                         aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bProcessed = false;
                         aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bIsTable = false;
                     }
                     checkLinks(aAllFacets.indexOf(functionParameters.facet));
-                    //Workaround: no Link if no authority
+                    // Workaround: no Link if no authority
                 } else {
                     oJsonModel.setData({ result: data });
                     // Check if response returned data as Gateway is currently not able to send the right HTTP status code for an empty document.
@@ -2858,51 +3054,52 @@ sap.ui.define([
                         }
 
                         functionParameters.facet.attachPress({ facet: functionParameters.facetContent }, function (oEvent, oData) {
-                            var oContent;
                             oTI.removeAllFacetContent();
                             aAllFacets[aAllFacets.indexOf(functionParameters.facet)].Links = [];
-                            oContent = facetFactory(oModel, functionParameters.entitySet, oData.facet, functionParameters.bindingPath, this);
+                            const oContent = facetFactory(oModel, functionParameters.entitySet, oData.facet, functionParameters.bindingPath, this);
                             oContent.setDescription(getTIDescription());
                             oTI.addFacetContent(oContent);
-                            //Workaround: no Link if no authority
+                            // Workaround: no Link if no authority
                             if (aAllFacets.indexOf(functionParameters.facet) >= 0) {
                                 aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bLoaded = true;
                                 aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bProcessed = false;
                                 aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bIsTable = false;
                             }
                             checkLinks(aAllFacets.indexOf(functionParameters.facet));
-                            //Workaround: no Link if no authority
+                            // Workaround: no Link if no authority
                             oTI.navigateToDetail();
                         });
                     } else {
                         functionParameters.facet.addStyleClass("sapFactsheetUtiEmptyTile");
                         functionParameters.facet.setHeightType(jQuery.device.is.phone ? FacetOverviewHeight.Auto : FacetOverviewHeight.S);
                     }
-                    //Workaround: no Link if no authority
+                    // Workaround: no Link if no authority
                     if (aAllFacets.indexOf(functionParameters.facet) >= 0) {
                         aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bLoaded = true;
                         aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bProcessed = false;
                         aAllFacets[aAllFacets.indexOf(functionParameters.facet)].bIsTable = false;
                     }
                     checkLinks(aAllFacets.indexOf(functionParameters.facet));
-                    //Workaround: no Link if no authority
+                    // Workaround: no Link if no authority
                 }
             };
-        };
-        var oDataReadCallbackError = function (functionParameters) {
-            return function (/*error*/) {
+        }
+        function oDataReadCallbackError (functionParameters) {
+            return function (/* error */) {
                 // OData returns an error. Don't display the facet.
                 oTI.removeFacet(functionParameters.facet);
             };
-        };
-        var oDataReadCallbackMedia = function (functionParameters) {
+        }
+        function oDataReadCallbackMedia (functionParameters) {
             return function (data) {
-                var oHLayout, oMediaResource, i, iCount, oTG;
-                oMediaResource = oMapping[functionParameters.navigationType]["com.sap.vocabularies.UI.v1.MediaResource"];
+                let oHLayout;
+                let iCount;
+                let oTG;
+                const oMediaResource = oMapping[functionParameters.navigationType]["com.sap.vocabularies.UI.v1.MediaResource"];
                 if (functionParameters.cardinality === "*") {
                     if (data.results && data.results.length) {
                         oHLayout = new HorizontalLayout().addStyleClass("sapFactsheetUtiPictureViewerOverview");
-                        for (i = 0; i < data.results.length; i += 1) {
+                        for (let i = 0; i < data.results.length; ++i) {
                             oHLayout.addContent(new Image({
                                 src: data.results[i][oMediaResource.Thumbnail.Url.Path],
                                 height: "85px"
@@ -2916,8 +3113,9 @@ sap.ui.define([
                             functionParameters.facet.setQuantity(iCount);
                         }
                         functionParameters.facet.setContent(oHLayout);
-                        functionParameters.facet.attachPress({ facet: functionParameters.facetContent, data: data }, function (oEvent, oData) {
-                            var oPictureViewer, sHeight, oImage;
+                        functionParameters.facet.attachPress({ facet: functionParameters.facetContent, data: data }, (oEvent, oData) => {
+                            let sHeight;
+                            let oImage;
                             oTI.removeAllFacetContent();
                             oTG = new UnifiedThingGroup();
                             if (oData.facet.Label && oData.facet.Label.String) {
@@ -2929,8 +3127,8 @@ sap.ui.define([
                             } else {
                                 sHeight = "550px";
                             }
-                            oPictureViewer = new Carousel({ height: sHeight });
-                            for (i = 0; i < oData.data.results.length; i += 1) {
+                            const oPictureViewer = new Carousel({ height: sHeight });
+                            for (let i = 0; i < oData.data.results.length; ++i) {
                                 oImage = new Image({ src: oData.data.results[i][oMediaResource.Url.Path] });
                                 if (jQuery.device.is.phone) {
                                     oImage.addStyleClass("sapFactsheetUtiCarouselMaxImageHeightPhone");
@@ -2950,20 +3148,27 @@ sap.ui.define([
                     }
                 }
             };
-        };
+        }
 
-        var extractContactsFromBatchRequest = function (oData, sOrder) {
-            var aContactResults = [], oContacts = {},
-                i, j, k, oContactMetadata, sPhone, sMobile, sFax, sTelephone, sPhoto, sMetadataEmail;
-            var fFieldValue = function (oMetadata, oContactResult) {
-                var i, sValue = "";
+        function extractContactsFromBatchRequest (oData, sOrder) {
+            let aContactResults = [];
+            const oContacts = {};
+            let oContactMetadata;
+            let sPhone;
+            let sMobile;
+            let sFax;
+            let sTelephone;
+            let sPhoto;
+            let sMetadataEmail;
+            function fFieldValue (oMetadata, oContactResult) {
+                let sValue = "";
                 if (oMetadata) {
                     if (oMetadata.Path) {
                         return oContactResult[oMetadata.Path];
                     } else if (oMetadata.String) {
                         return oMetadata.String;
                     } else if (oMetadata.Apply.Name === "odata.concat") {
-                        for (i = 0; i < oMetadata.Apply.Parameters.length; i += 1) {
+                        for (let i = 0; i < oMetadata.Apply.Parameters.length; ++i) {
                             if (oMetadata.Apply.Parameters[i].Type === "Path") {
                                 sValue = sValue + oContactResult[oMetadata.Apply.Parameters[i].Value];
                             } else if (oMetadata.Apply.Parameters[i].Type === "String") {
@@ -2973,10 +3178,10 @@ sap.ui.define([
                         return sValue;
                     }
                 }
-            };
+            }
             oContacts.iCount = 0;
             oContacts.aContacts = [];
-            for (i = 0; i < oData.__batchResponses.length; i += 1) {
+            for (let i = 0; i < oData.__batchResponses.length; ++i) {
                 if (!oData.__batchResponses[i].data) {
                     continue;
                 }
@@ -2988,10 +3193,10 @@ sap.ui.define([
                 if (aContactResults.length > 0) {
                     oContactMetadata = oMapping[aContactResults[0].__metadata.type]["com.sap.vocabularies.Communication.v1.Contact"];
                     if (oContactMetadata) {
-                        for (j = 0; j < aContactResults.length; j += 1) {
+                        for (let j = 0; j < aContactResults.length; ++j) {
                             sPhone = sMobile = sFax = "";
                             if (oContactMetadata.tel) {
-                                for (k = 0; k < oContactMetadata.tel.length; k += 1) {
+                                for (let k = 0; k < oContactMetadata.tel.length; ++k) {
                                     if (oContactMetadata.tel[k].type && oContactMetadata.tel[k].type.EnumMember) {
                                         sTelephone = fFieldValue(oContactMetadata.tel[k].uri, aContactResults[j]);
                                         switch (oContactMetadata.tel[k].type.EnumMember) {
@@ -3033,22 +3238,27 @@ sap.ui.define([
                 }
             }
             if (sOrder) {
-                oContacts.aContacts.sort(function (a, b) {
+                oContacts.aContacts.sort((a, b) => {
                     return a[sOrder] > b[sOrder] ? 1 : -1;
                 });
             }
             return oContacts;
-        };
-        var oDataReadCallbackContacts = function (/*functionParameters*/) {
+        }
+        function oDataReadCallbackContacts (/* functionParameters */) {
             return function (oData) {
-                var i, oContacts, oGrid, oHLayout, oVLayout, oImgLayout, oImage, sTileSize;
-                oContacts = extractContactsFromBatchRequest(oData, "sOrder");
-                oGrid = new Grid({
+                let i;
+                let oHLayout;
+                let oVLayout;
+                let oImgLayout;
+                let oImage;
+                let sTileSize;
+                const oContacts = extractContactsFromBatchRequest(oData, "sOrder");
+                const oGrid = new Grid({
                     defaultSpan: "L6 M6 S12",
                     hSpacing: 0,
                     vSpacing: 0
                 }).addStyleClass("sapFactsheetUtiContactsGrid");
-                for (i = 0; i < oContacts.aContacts.length && i < 4; i += 1) {
+                for (let i = 0; i < oContacts.aContacts.length && i < 4; ++i) {
                     oImgLayout = new VerticalLayout();
                     if (oContacts.aContacts[i].photo) {
                         oImage = new Image({
@@ -3069,15 +3279,14 @@ sap.ui.define([
                         }).addStyleClass("sapFactsheetUtiTextName"),
                         new Text({
                             text: oContacts.aContacts[i].title
-                        }).addStyleClass("sapFactsheetUtiTextValue")
-                        ]
+                        }).addStyleClass("sapFactsheetUtiTextValue")]
                     });
                     oHLayout = new HorizontalLayout({
                         content: [oImgLayout, oVLayout]
                     }).addStyleClass("sapFactsheetUtiContactsBox");
                     oGrid.addContent(oHLayout);
                 }
-                oFacet = sap.ui.getCore().byId(oTI.data("contactFacetId"));
+                oFacet = Core.byId(oTI.data("contactFacetId"));
                 oFacet.setQuantity(oContacts.iCount);
                 if (i > 0) {
                     oFacet.setContent(oGrid);
@@ -3086,30 +3295,30 @@ sap.ui.define([
                     } else {
                         sTileSize = FacetOverviewHeight.L;
                     }
-                    oFacet.attachPress(function () {
-                        var i, aOperations = [], sBatchPath;
+                    oFacet.attachPress(() => {
+                        const aOperations = [];
+                        let sBatchPath;
                         oModel.clearBatch();
-                        for (i = 0; i < oMapping[sEntityType]["com.sap.vocabularies.UI.v1.Contacts"].length; i += 1) {
+                        for (let i = 0; i < oMapping[sEntityType]["com.sap.vocabularies.UI.v1.Contacts"].length; ++i) {
                             sNavPath = oMapping[sEntityType]["com.sap.vocabularies.UI.v1.Contacts"][i].AnnotationPath;
                             sNavPath = sNavPath.substring(0, sNavPath.lastIndexOf("@") - 1);
                             if (sNavPath !== "") {
-                                sBatchPath = sBindingPath + "/" + sNavPath;
+                                sBatchPath = `${sBindingPath}/${sNavPath}`;
                             } else {
                                 sBatchPath = sBindingPath;
                             }
                             aOperations.push(oModel.createBatchOperation(sBatchPath, "GET"));
                         }
                         oModel.addBatchReadOperations(aOperations);
-                        oModel.submitBatch(function (oData) {
-                            var oContacts, oJSONModel, oTemplate, oTable, oVSDialog, oTG, oResourceBundle;
-                            oResourceBundle = jQuery.sap.resources({
-                                url: jQuery.sap.getModulePath("sap.ushell.components.container.") + "/resources/resources.properties",
-                                language: sap.ui.getCore().getConfiguration().getLanguage()
+                        oModel.submitBatch((oData) => {
+                            const oResourceBundle = jQuery.sap.resources({
+                                url: `${jQuery.sap.getModulePath("sap.ushell.components.container.")}/resources/resources.properties`,
+                                language: Configuration.getLanguage()
                             });
-                            oContacts = extractContactsFromBatchRequest(oData, "sEntity");
-                            oJSONModel = new JSONModel();
+                            const oContacts = extractContactsFromBatchRequest(oData, "sEntity");
+                            const oJSONModel = new JSONModel();
                             oJSONModel.setData(oContacts);
-                            oTemplate = new ColumnListItem({
+                            const oTemplate = new ColumnListItem({
                                 type: mobileLibrary.Inactive,
                                 unread: false,
                                 cells: [
@@ -3140,7 +3349,7 @@ sap.ui.define([
                                     new Link({ text: "{email}", href: "mailto:{email}" })
                                 ]
                             });
-                            oTable = new Table({
+                            const oTable = new Table({
                                 threshold: 2,
                                 inset: false,
                                 showUnread: true,
@@ -3182,22 +3391,23 @@ sap.ui.define([
                                         header: new Text({ text: oResourceBundle.getText("USHELL_FACTSHEET_EMAIL") }),
                                         minScreenWidth: "Tablet",
                                         demandPopin: true
-                                    })],
+                                    })
+                                ],
                                 items: {
                                     path: "/aContacts",
                                     template: oTemplate
                                 }
                             });
-                            oVSDialog = new ViewSettingsDialog({
+                            const oVSDialog = new ViewSettingsDialog({
                                 sortItems: [new ViewSettingsItem({ key: "fn", text: oResourceBundle.getText("USHELL_FACTSHEET_NAME") }),
-                                new ViewSettingsItem({ key: "phone", text: oResourceBundle.getText("USHELL_FACTSHEET_PHONE") }),
-                                new ViewSettingsItem({ key: "mobile", text: resources.i18n.getText("mobile") }),
-                                new ViewSettingsItem({ key: "fax", text: resources.i18n.getText("fax") }),
-                                new ViewSettingsItem({ key: "email", text: oResourceBundle.getText("USHELL_FACTSHEET_EMAIL") })],
+                                    new ViewSettingsItem({ key: "phone", text: oResourceBundle.getText("USHELL_FACTSHEET_PHONE") }),
+                                    new ViewSettingsItem({ key: "mobile", text: resources.i18n.getText("mobile") }),
+                                    new ViewSettingsItem({ key: "fax", text: resources.i18n.getText("fax") }),
+                                    new ViewSettingsItem({ key: "email", text: oResourceBundle.getText("USHELL_FACTSHEET_EMAIL") })],
                                 confirm: function (evt) {
-                                    var mParams, oBinding, aSorters = [];
-                                    mParams = evt.getParameters();
-                                    oBinding = oTable.getBinding("items");
+                                    const aSorters = [];
+                                    const mParams = evt.getParameters();
+                                    const oBinding = oTable.getBinding("items");
                                     if (mParams.sortItem) {
                                         aSorters.push(new Sorter(mParams.sortItem.getKey(), mParams.sortDescending));
                                         oBinding.sort(aSorters);
@@ -3210,14 +3420,14 @@ sap.ui.define([
                                     new ToolbarSpacer(),
                                     new Button({
                                         icon: "sap-icon://drop-down-list",
-                                        press: function (/*evt*/) {
+                                        press: function (/* evt */) {
                                             oVSDialog.open();
                                         }
                                     })
                                 ]
                             }));
                             oTable.setModel(oJSONModel);
-                            oTG = new UnifiedThingGroup({
+                            const oTG = new UnifiedThingGroup({
                                 title: oFacet.getTitle(),
                                 description: getTIDescription(),
                                 content: oTable
@@ -3234,10 +3444,10 @@ sap.ui.define([
                 }
                 oFacet.setHeightType(jQuery.device.is.phone ? FacetOverviewHeight.Auto : sTileSize);
             };
-        };
+        }
 
         // Loop at the further facets and make oData reads to the corresponding services
-        for (i = 0; i < aFacets.length; i += 1) {
+        for (let i = 0; i < aFacets.length; ++i) {
             if (aFacets[i]["com.sap.vocabularies.UI.v1.Map"]) {
                 sNavPath = aFacets[i].Target.AnnotationPath;
                 sNavPath = sNavPath.substring(0, sNavPath.lastIndexOf("@") - 1);
@@ -3262,12 +3472,12 @@ sap.ui.define([
                     heightType: jQuery.device.is.phone ? FacetOverviewHeight.Auto : FacetOverviewHeight.L,
                     content: oGeoContent
                 });
-                //Workaround: no Link if no authority
+                // Workaround: no Link if no authority
                 aAllFacets.push(oFacet);
                 aAllFacets[aAllFacets.length - 1].bLoaded = false;
                 aAllFacets[aAllFacets.length - 1].bProcessed = false;
                 aAllFacets[aAllFacets.length - 1].bIsTable = false;
-                //Workaround: no Link if no authority
+                // Workaround: no Link if no authority
                 functionParameters = {
                     cardinality: sCardinality,
                     navigationPath: sNavPath,
@@ -3283,7 +3493,7 @@ sap.ui.define([
                 } else {
                     parameters = [];
                 }
-                oModel.read(sBindingPath + "/" + sNavPath, "", parameters, true, oDataReadCallbackGeo(functionParameters));
+                oModel.read(`${sBindingPath}/${sNavPath}`, "", parameters, true, oDataReadCallbackGeo(functionParameters));
                 oTI.addFacet(oFacet);
             } else if (aFacets[i].Target) {
                 sNavPath = aFacets[i].Target.AnnotationPath;
@@ -3313,20 +3523,20 @@ sap.ui.define([
                             } else {
                                 parameters = [];
                             }
-                            oModel.read(sBindingPath + "/" + sNavPath, "", parameters, true, oDataReadCallbackMedia(functionParameters));
+                            oModel.read(`${sBindingPath}/${sNavPath}`, "", parameters, true, oDataReadCallbackMedia(functionParameters));
                         } else {
-                            //Workaround: no Link if no authority
+                            // Workaround: no Link if no authority
                             aAllFacets.push(oFacet);
                             aAllFacets[aAllFacets.length - 1].bLoaded = false;
                             aAllFacets[aAllFacets.length - 1].bProcessed = false;
                             aAllFacets[aAllFacets.length - 1].bIsTable = false;
-                            //Workaround: no Link if no authority
+                            // Workaround: no Link if no authority
                             if (sCardinality === "*") {
                                 parameters = ["$inlinecount=allpages", "$top=3"];
                             } else {
                                 parameters = [];
                             }
-                            oModel.read(sBindingPath + "/" + sNavPath, "", parameters, true, oDataReadCallback(functionParameters), oDataReadCallbackError(functionParameters));
+                            oModel.read(`${sBindingPath}/${sNavPath}`, "", parameters, true, oDataReadCallback(functionParameters), oDataReadCallbackError(functionParameters));
                         }
                         oTI.addFacet(oFacet);
                     }
@@ -3338,15 +3548,15 @@ sap.ui.define([
                     oTI.data("contactFacetId", oFacet.sId);
                     functionParameters = { facet: oFacet };
                     oModel.clearBatch();
-                    for (j = 0; j < oMapping[sEntityType][sTerm].length; j += 1) {
+                    for (let j = 0; j < oMapping[sEntityType][sTerm].length; ++j) {
                         sNavPath = oMapping[sEntityType][sTerm][j].AnnotationPath;
                         sNavPath = sNavPath.substring(0, sNavPath.lastIndexOf("@") - 1);
                         if (sNavPath !== "") {
                             sCardinality = getAssociationMultiplicity(sEntitySet, sNavPath, oMetadata);
                             if (sCardinality === "*") {
-                                sBatchPath = sBindingPath + "/" + sNavPath + "?$top=4&$inlinecount=allpages";
+                                sBatchPath = `${sBindingPath}/${sNavPath}?$top=4&$inlinecount=allpages`;
                             } else {
-                                sBatchPath = sBindingPath + "/" + sNavPath;
+                                sBatchPath = `${sBindingPath}/${sNavPath}`;
                             }
                         } else {
                             sBatchPath = sBindingPath;
@@ -3361,23 +3571,29 @@ sap.ui.define([
         }
 
         // Footer area
-        oAddBookmarkButton = new AddBookmarkButton();
-        var thingInspectorBindingChanged = function () {
-            var oBusinessParameters = {},
-                i, o, key, val, aBusinessParams, sTerm, aTerm, oParaValue, sSemanticObject, sJamDiscussId, sKey, oURLParsing, sShellHash, oShellHash;
-            oAddBookmarkButton.setAppData({ title: oTI.getTitle(), subtitle: oTI.getName() + " - " + oTI.getDescription() });
+        const oAddBookmarkButton = new AddBookmarkButton();
+        function thingInspectorBindingChanged () {
+            const oBusinessParameters = {};
+            let key;
+            let val;
+            let sTerm;
+            let aTerm;
+            let oParaValue;
+            let sJamDiscussId;
+            let sKey;
+            oAddBookmarkButton.setAppData({ title: oTI.getTitle(), subtitle: `${oTI.getName()} - ${oTI.getDescription()}` });
             oAddBookmarkButton.setEnabled(true);
-            oURLParsing = sap.ushell.Container.getService("URLParsing");
-            sShellHash = oURLParsing.getShellHash(window.location.href);
-            oShellHash = oURLParsing.parseShellHash(sShellHash);
-            sSemanticObject = oShellHash.semanticObject;
+            const oURLParsing = sap.ushell.Container.getService("URLParsing");
+            const sShellHash = oURLParsing.getShellHash(window.location.href);
+            const oShellHash = oURLParsing.parseShellHash(sShellHash);
+            const sSemanticObject = oShellHash.semanticObject;
             oTransactionSheet = new LinkActionSheet({
                 showCancelButton: true,
                 placement: PlacementType.Top
             });
             sBusinessParams = getEntityKeyFromUri(sUri, oModel);
-            aBusinessParams = sBusinessParams.split(",");
-            for (i = 0; i < aBusinessParams.length; i += 1) {
+            const aBusinessParams = sBusinessParams.split(",");
+            for (let i = 0; i < aBusinessParams.length; ++i) {
                 aBusinessParams[i] = aBusinessParams[i].replace("='", "=", "g");
                 if (aBusinessParams[i].lastIndexOf("'") === aBusinessParams[i].length - 1) {
                     aBusinessParams[i] = aBusinessParams[i].slice(0, -1);
@@ -3387,24 +3603,25 @@ sap.ui.define([
                 if (oMapping[sEntityType].hasOwnProperty(sTerm)) {
                     if (sTerm.indexOf("com.sap.vocabularies.Common.v1.SecondaryKey") === 0) {
                         aTerm = oMapping[sEntityType][sTerm];
-                        for (i = 0; i < aTerm.length; i += 1) {
+                        for (let i = 0; i < aTerm.length; ++i) {
                             oParaValue = this.getBoundContext().getProperty(aTerm[i].PropertyPath);
                             if (oParaValue) {
-                                aBusinessParams.push(aTerm[i].PropertyPath + "=" + oParaValue);
+                                aBusinessParams.push(`${aTerm[i].PropertyPath}=${oParaValue}`);
                             }
                         }
                     }
                 }
             }
-            for (i = 0; i < aBusinessParams.length; i += 1) {
+            for (let i = 0; i < aBusinessParams.length; ++i) {
                 key = aBusinessParams[i].substr(0, aBusinessParams[i].indexOf("="));
                 val = aBusinessParams[i].substr(aBusinessParams[i].indexOf("=") + 1, aBusinessParams[i].length);
                 oBusinessParameters[decodeURIComponent(key)] = decodeURIComponent(val);
             }
             oLinks = sap.ushell.Container.getService("CrossApplicationNavigation").getSemanticObjectLinks(sSemanticObject, oBusinessParameters);
-            oLinks.done(function (aLinks) {
-                var i, sIntent, sLink;
-                for (i = 0; i < aLinks.length; i += 1) {
+            oLinks.done((aLinks) => {
+                let sIntent;
+                let sLink;
+                for (let i = 0; i < aLinks.length; ++i) {
                     sLink = aLinks[i].intent;
                     if (sLink.indexOf(FACTSHEET) < 0 &&
                         sLink.indexOf("-analyzeKPIDetails~") < 0 &&
@@ -3426,24 +3643,24 @@ sap.ui.define([
                     }
                 }
             });
-            oTI.attachTransactionsButtonPress(function (oEvent) {
+            oTI.attachTransactionsButtonPress((oEvent) => {
                 oTransactionSheet.openBy(oEvent.getParameter("caller"));
             });
             this.detachChange(thingInspectorBindingChanged);
             // Set the browser Tab Name as Object Type: Object Name (Object Description) e.g. "Article: Nutella (AAUFEA000100001)"
-            AppConfiguration.setWindowTitle(oTI.getTitle().trim() + ": " + oTI.getName().trim() + " (" + oTI.getDescription().trim() + ")");
+            AppConfiguration.setWindowTitle(`${oTI.getTitle().trim()}: ${oTI.getName().trim()} (${oTI.getDescription().trim()})`);
 
             oTI.setActionsVisible(true);
             oEmailBtn = new Button({
                 text: oSapSuiteRb.getText("UNIFIEDTHINGINSPECTOR_FOOTER_BUTTON_EMAIL_LINK"),
                 icon: "sap-icon://email",
-                press: function (/*oE*/) {
+                press: function (/* oE */) {
                     URLHelper.triggerEmail("", oTI.getName(), window.location.href);
                 }
             });
             oActionSheet = new ActionSheet({ placement: PlacementType.Top });
             sJamDiscussId = sUri.substr(0, sUri.lastIndexOf("/") + 1);
-            for (o in oModel.oData) {
+            for (const o in oModel.oData) {
                 if (oModel.oData.hasOwnProperty(o)) {
                     sJamDiscussId = sJamDiscussId + o;
                     sKey = o.substring(o.indexOf("(") + 1, o.indexOf(")"));
@@ -3480,19 +3697,19 @@ sap.ui.define([
             }));
             oActionSheet.addButton(oAddBookmarkButton);
             oActionSheet.addButton(oEmailBtn);
-            oTI.attachActionsButtonPress(function (oEvent) {
+            oTI.attachActionsButtonPress((oEvent) => {
                 oActionSheet.openBy(oEvent.getParameter("caller"));
             });
-            //Workaround: no Link if no authority
+            // Workaround: no Link if no authority
             aAllFacets[0].bLoaded = true;
             aAllFacets[0].bProcessed = false;
             checkLinks(0);
-            //Workaround: no Link if no authority
-        };
+            // Workaround: no Link if no authority
+        }
 
         oTI.getElementBinding().attachChange(thingInspectorBindingChanged);
 
-        oTI.attachBackAction(function (/*oEvent*/) {
+        oTI.attachBackAction((/* oEvent */) => {
             history.back();
         });
         oTI.addDelegate({
@@ -3501,7 +3718,7 @@ sap.ui.define([
             }
         });
         return oTI;
-    };
+    }
 
     return function (sUri, sAnnotationUri) {
         try {