diff --git a/html/src/app.js b/html/src/app.js
index 92ba1c7f..c53fbfd1 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -889,6 +889,11 @@ speechSynthesis.getVoices();
                     if (this.traveling && this.location === 'traveling') {
                         instanceId = this.traveling;
                     }
+                    if (!instanceId && this.hint.length === 8) {
+                        // shortName
+                        API.$emit('SHOW_WORLD_DIALOG_SHORTNAME', this.hint);
+                        return;
+                    }
                     API.$emit('SHOW_WORLD_DIALOG', instanceId);
                 }
             }
@@ -4353,6 +4358,9 @@ speechSynthesis.getVoices();
                 this.setBranch();
             });
             API.$on('SHOW_WORLD_DIALOG', (tag) => this.showWorldDialog(tag));
+            API.$on('SHOW_WORLD_DIALOG_SHORTNAME', (tag) =>
+                this.verifyShortName('', tag)
+            );
             API.$on('SHOW_LAUNCH_DIALOG', (tag) => this.showLaunchDialog(tag));
             this.updateLoop();
             this.getGameLogTable();
@@ -5957,7 +5965,7 @@ speechSynthesis.getVoices();
     };
 
     $app.methods.displayLocation = function (location, worldName) {
-        var text = '';
+        var text = worldName;
         var L = API.parseLocation(location);
         if (L.isOffline) {
             text = 'Offline';
@@ -5968,8 +5976,6 @@ speechSynthesis.getVoices();
         } else if (L.worldId) {
             if (L.instanceId) {
                 text = `${worldName} ${L.accessType}`;
-            } else {
-                text = worldName;
             }
         }
         return text;
@@ -9074,7 +9080,7 @@ speechSynthesis.getVoices();
         'Moderation',
         'Camera',
         'SpawnEmoji',
-        'PhotonMasterMigrate',
+        'MasterMigrate',
         'PhotonBot'
     ];
 
@@ -9757,7 +9763,7 @@ speechSynthesis.getVoices();
                 this.addEntryPhotonEvent({
                     photonId,
                     text: `Photon Master Migrate`,
-                    type: 'PhotonMasterMigrate',
+                    type: 'MasterMigrate',
                     created_at: gameLogDate
                 });
             }
@@ -12484,8 +12490,8 @@ speechSynthesis.getVoices();
     $app.data.photonEventOverlayFilter = configRepository.getString(
         'VRCX_PhotonEventOverlayFilter'
     );
-    $app.data.photonOverlayMessageTimeout = configRepository.getString(
-        'VRCX_photonOverlayMessageTimeout'
+    $app.data.photonOverlayMessageTimeout = Number(
+        configRepository.getString('VRCX_photonOverlayMessageTimeout')
     );
     $app.data.photonLoggingEnabled = false;
     $app.data.gameLogDisabled = configRepository.getBool(
diff --git a/html/src/vr.js b/html/src/vr.js
index 9e1cc884..19e7f717 100644
--- a/html/src/vr.js
+++ b/html/src/vr.js
@@ -102,6 +102,8 @@ Vue.component('marquee-text', MarqueeText);
                     this.text = 'Offline';
                 } else if (L.isPrivate) {
                     this.text = 'Private';
+                } else if (L.isTraveling) {
+                    this.text = 'Traveling';
                 } else if (typeof this.hint === 'string' && this.hint !== '') {
                     if (L.instanceId) {
                         this.text = `${this.hint} #${L.instanceName} ${L.accessType}`;
@@ -206,11 +208,13 @@ Vue.component('marquee-text', MarqueeText);
             tag: _tag,
             isOffline: false,
             isPrivate: false,
+            isTraveling: false,
             worldId: '',
             instanceId: '',
             instanceName: '',
             accessType: '',
             region: '',
+            shortName: '',
             userId: null,
             hiddenId: null,
             privateId: null,
@@ -222,6 +226,8 @@ Vue.component('marquee-text', MarqueeText);
             ctx.isOffline = true;
         } else if (_tag === 'private') {
             ctx.isPrivate = true;
+        } else if (_tag === 'traveling') {
+            ctx.isTraveling = true;
         } else if (_tag.startsWith('local') === false) {
             var sep = _tag.indexOf(':');
             if (sep >= 0) {
@@ -531,17 +537,17 @@ Vue.component('marquee-text', MarqueeText);
     };
 
     $app.methods.displayLocation = function (location, worldName) {
-        var text = '';
+        var text = worldName;
         var L = this.parseLocation(location);
         if (L.isOffline) {
             text = 'Offline';
         } else if (L.isPrivate) {
             text = 'Private';
+        } else if (L.isTraveling) {
+            text = 'Traveling';
         } else if (L.worldId) {
             if (L.instanceId) {
                 text = `${worldName} ${L.accessType}`;
-            } else {
-                text = worldName;
             }
         }
         return text;