diff --git a/src/components/map/track-hover-info/TrackHoverInfoConsts.js b/src/components/map/track-hover-info/TrackHoverInfoConsts.js
index c520047..5b6d6eb 100644
--- a/src/components/map/track-hover-info/TrackHoverInfoConsts.js
+++ b/src/components/map/track-hover-info/TrackHoverInfoConsts.js
@@ -1,5 +1,5 @@
 import { ElectrificationStatus } from "../../../model/electrification-status";
-import {TrackShape, TrackSource} from "../../../model/tracks/track";
+import {TrackShape} from "../../../model/tracks/track";
 
 const TrackHoverInfoConsts = {
     electrification: {
@@ -8,14 +8,9 @@ const TrackHoverInfoConsts = {
         [ElectrificationStatus.NOT_CHECKED]: 'Unknown',
         [ElectrificationStatus.CONFLICT]: 'Error / Conflict',
     },
-    source: {
-        [TrackSource.STANDARD]: 'Standard track',
-        [TrackSource.SWITCH]: 'Switch track',
-        [TrackSource.ROUTE]: 'Route track',
-    },
     shape: {
         [TrackShape.STRAIGHT]: 'Straight',
-        [TrackShape.ARC]: 'Circle arc',
+        [TrackShape.ARC]: 'Curve',
         [TrackShape.BEZIER]: 'Bézier curve',
     }
 };
diff --git a/src/components/map/track-hover-info/TrackHoverInfoPopup.js b/src/components/map/track-hover-info/TrackHoverInfoPopup.js
index 5955ca2..5e64136 100644
--- a/src/components/map/track-hover-info/TrackHoverInfoPopup.js
+++ b/src/components/map/track-hover-info/TrackHoverInfoPopup.js
@@ -1,3 +1,4 @@
+import Constants from "../../../helpers/constants";
 import { QuestionMarkIcon, SlopeIcon, SpeedIcon, HashIcon, LightningIcon, RadiusIcon } from "../../../icons";
 import TrackHoverInfoConsts from "./TrackHoverInfoConsts";
 
@@ -9,22 +10,20 @@ export default function TrackHoverInfoPopup(props) {
         Math.abs(track.end_slope).toFixed(1),
     ]));
     const slopeOptions = {join: ' / ', subOptions: {suffix: ' ‰'}};
-    const typeValue = [
-        TrackHoverInfoConsts.source[track.source],
-        TrackHoverInfoConsts.shape[track.shape],
-    ];
     const showAlignHint = track.r === 0;
 
     return (
         <div className="track-hover-info-popup">
             <table>
                 <tbody>
-                    <InfoPopupItem icon={HashIcon} value={track['id_station']} label="Track ID" />
+                    {Constants.map.showDebugTrackIds && (
+                        <InfoPopupItem icon={HashIcon} value={track.id} label="Track ID" />
+                    )}
                     <InfoPopupItem icon={HashIcon} value={track['id_isolation']} label="Isolation ID" />
                     <InfoPopupItem icon={SpeedIcon} value={track['derailspeed']} label="Derail speed" options={{suffix: ' km/h'}} />
                     <InfoPopupItem icon={SpeedIcon} value={track['maxspeed']} label="Max. speed" options={{suffix: ' km/h'}} />
                     <InfoPopupItem icon={LightningIcon} value={track['electrificationStatus']} label="Electrification" options={{translationConstKey: 'electrification'}} />
-                    <InfoPopupItem icon={QuestionMarkIcon} value={typeValue} label="Type" options={{join: ' / '}} />
+                    <InfoPopupItem icon={QuestionMarkIcon} value={track.shape} label="Type" options={{join: ' / ', translationConstKey: 'shape'}} />
                     <InfoPopupItem icon={SlopeIcon} value={slopeValue} label="Slope" options={slopeOptions} />
                     <InfoPopupSwitchItems track={track} />
                     <InfoPopupShapeItems track={track} />
diff --git a/src/helpers/constants.js b/src/helpers/constants.js
index d14ba22..88586cb 100644
--- a/src/helpers/constants.js
+++ b/src/helpers/constants.js
@@ -7,7 +7,8 @@ const Constants = {
         zoomDefault: 5,
         rotationSensitivity: 0.2,
         forcePointerEvents: false,
-        platformMaxTilt: 0.5
+        platformMaxTilt: 0.5,
+        showDebugTrackIds: false
     },
     parser: {
         logSceneryAfterFinished: true,
@@ -152,8 +153,8 @@ const Constants = {
             optionDefault: 'standard-track',
             options: {
                 'standard-track': ['#00a', 'Standard track'],
-                'point-track': ['#0a0', 'Switch track'],
                 'bezier-track': ['#aa8', 'Bézier track'],
+                'point-track': ['#0a0', 'Switch track'],
                 'route-track': ['#a6d', 'Route track'],
             }
         },