diff --git a/client/frontend/src/map/datasource.ts b/client/frontend/src/map/datasource.ts
index 62129fd09..6dafb4d57 100644
--- a/client/frontend/src/map/datasource.ts
+++ b/client/frontend/src/map/datasource.ts
@@ -277,7 +277,7 @@ export class DataSource {
                 id: node.Id,
                 label: nodeInfo.displayname ?? `${nodeInfo.asn}/${nodeInfo.name}`,
                 type: 'node',
-                shape: nodeInfo.role == 'Router' ? 'dot' : 'hexagon',
+                shape: ['Router', 'BorderRouter'].includes(nodeInfo.role) ? 'dot' : 'hexagon',
                 object: node
             };
 
diff --git a/client/frontend/src/map/ui.ts b/client/frontend/src/map/ui.ts
index 506a7ad6f..67ad20256 100644
--- a/client/frontend/src/map/ui.ts
+++ b/client/frontend/src/map/ui.ts
@@ -891,7 +891,7 @@ export class MapUi {
 
         if (vertex.type == 'node') {
             let node = vertex.object as EmulatorNode;
-            title.innerText = `${node.meta.emulatorInfo.role == 'Router' ? 'Router' : 'Host'}: ${vertex.label}`;
+            title.innerText = `${ ['Router', 'BorderRouter'].includes(node.meta.emulatorInfo.role) ? 'Router' : 'Host'}: ${vertex.label}`;
 
             if (node.meta.emulatorInfo.description) {
                 let div = document.createElement('div');
@@ -921,7 +921,7 @@ export class MapUi {
 
             infoPlate.appendChild(ipAddresses);
 
-            if (node.meta.emulatorInfo.role == 'Router' || node.meta.emulatorInfo.role == 'Route Server') {
+            if (['Router', 'Route Server', 'BorderRouter'].includes(node.meta.emulatorInfo.role)) {
                 let bgpDetails = document.createElement('div');
                 bgpDetails.classList.add('section');
 
diff --git a/client/frontend/tsconfig.json b/client/frontend/tsconfig.json
index 42323d42f..99f76e3d9 100644
--- a/client/frontend/tsconfig.json
+++ b/client/frontend/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "esnext",
-    "target": "es5",
+    "target": "ES2016",
     "removeComments": true,
     "preserveConstEnums": true,
     "sourceMap": true,
diff --git a/examples/.not_ready_examples/25-wannacry/map/frontend/src/map/datasource.ts b/examples/.not_ready_examples/25-wannacry/map/frontend/src/map/datasource.ts
index 62129fd09..6dafb4d57 100644
--- a/examples/.not_ready_examples/25-wannacry/map/frontend/src/map/datasource.ts
+++ b/examples/.not_ready_examples/25-wannacry/map/frontend/src/map/datasource.ts
@@ -277,7 +277,7 @@ export class DataSource {
                 id: node.Id,
                 label: nodeInfo.displayname ?? `${nodeInfo.asn}/${nodeInfo.name}`,
                 type: 'node',
-                shape: nodeInfo.role == 'Router' ? 'dot' : 'hexagon',
+                shape: ['Router', 'BorderRouter'].includes(nodeInfo.role) ? 'dot' : 'hexagon',
                 object: node
             };
 
diff --git a/examples/.not_ready_examples/25-wannacry/map/frontend/src/map/ui.ts b/examples/.not_ready_examples/25-wannacry/map/frontend/src/map/ui.ts
index 506a7ad6f..3d653b79f 100644
--- a/examples/.not_ready_examples/25-wannacry/map/frontend/src/map/ui.ts
+++ b/examples/.not_ready_examples/25-wannacry/map/frontend/src/map/ui.ts
@@ -891,7 +891,7 @@ export class MapUi {
 
         if (vertex.type == 'node') {
             let node = vertex.object as EmulatorNode;
-            title.innerText = `${node.meta.emulatorInfo.role == 'Router' ? 'Router' : 'Host'}: ${vertex.label}`;
+            title.innerText = `${['Router', 'BorderRouter'].includes(node.meta.emulatorInfo.role) ? 'Router' : 'Host'}: ${vertex.label}`;
 
             if (node.meta.emulatorInfo.description) {
                 let div = document.createElement('div');
@@ -921,7 +921,7 @@ export class MapUi {
 
             infoPlate.appendChild(ipAddresses);
 
-            if (node.meta.emulatorInfo.role == 'Router' || node.meta.emulatorInfo.role == 'Route Server') {
+            if (['Router', 'Route Server', 'BorderRouter'].includes(node.meta.emulatorInfo.role)) {
                 let bgpDetails = document.createElement('div');
                 bgpDetails.classList.add('section');