diff --git a/html/src/app.js b/html/src/app.js
index 7bc962e8..bb517f6b 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -251,6 +251,7 @@ speechSynthesis.getVoices();
         bfi: 'British Sign Language',
         dse: 'Dutch Sign Language',
         fsl: 'French Sign Language',
+        jsl: 'Japanese Sign Language',
         kvk: 'Korean Sign Language'
     };
 
@@ -284,6 +285,7 @@ speechSynthesis.getVoices();
         bfi: 'gb',
         dse: 'nl',
         fsl: 'fr',
+        jsl: 'jp',
         kvk: 'kr'
     };
     // #endregion
@@ -18182,6 +18184,7 @@ speechSynthesis.getVoices();
         isFavorite: false,
         isBlocked: false,
         isQuestFallback: false,
+        hasImposter: false,
         treeData: [],
         fileSize: '',
         inCache: false,
@@ -18240,6 +18243,7 @@ speechSynthesis.getVoices();
         D.cacheLocked = false;
         D.cachePath = '';
         D.isQuestFallback = false;
+        D.hasImposter = false;
         D.isFavorite = API.cachedFavoritesByObjectId.has(avatarId);
         D.isBlocked = API.cachedAvatarModerations.has(avatarId);
         this.ignoreAvatarMemoSave = true;
@@ -18274,11 +18278,14 @@ speechSynthesis.getVoices();
                 for (let i = ref.unityPackages.length - 1; i > -1; i--) {
                     var unityPackage = ref.unityPackages[i];
                     if (
+                        !assetUrl &&
                         unityPackage.platform === 'standalonewindows' &&
                         this.compareUnityVersion(unityPackage.unityVersion)
                     ) {
                         assetUrl = unityPackage.assetUrl;
-                        break;
+                    }
+                    if (unityPackage.variant === 'impostor') {
+                        D.hasImposter = true;
                     }
                 }
                 var fileId = extractFileId(assetUrl);
@@ -18758,13 +18765,13 @@ speechSynthesis.getVoices();
             D.worldId = L.tag;
             D.worldName = args.ref.name;
             D.friendsInInstance = [];
-            for (var ctx of this.friends.values()) {
+            var friendsInCurrentInstance = this.lastLocation.friendList;
+            for (var friend of friendsInCurrentInstance.values()) {
+                var ctx = this.friends.get(friend.userId);
                 if (typeof ctx.ref === 'undefined') {
                     continue;
                 }
-                if (ctx.ref.location === this.lastLocation.location) {
-                    D.friendsInInstance.push(ctx);
-                }
+                D.friendsInInstance.push(ctx);
             }
             D.visible = true;
         });
@@ -24086,6 +24093,10 @@ speechSynthesis.getVoices();
     };
 
     $app.methods.compareUnityVersion = function (version) {
+        if (!API.cachedConfig.sdkUnityVersion) {
+            console.error('No cachedConfig.sdkUnityVersion');
+            return false;
+        }
         var currentUnityVersion = API.cachedConfig.sdkUnityVersion.replace(
             /\D/g,
             ''
diff --git a/html/src/index.pug b/html/src/index.pug
index f22cdf43..c3502e96 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -820,6 +820,7 @@ html
                                     el-tag(v-if="avatarDialog.ref.releaseStatus === 'public'" type="success" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.avatar.tags.public') }}
                                     el-tag(v-else type="danger" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.avatar.tags.private') }}
                                     el-tag(v-if="avatarDialog.isQuestFallback" type="info" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.avatar.tags.fallback') }}
+                                    el-tag(v-if="avatarDialog.hasImposter" type="info" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.avatar.tags.impostor') }}
                                     el-tag(v-if="avatarDialog.ref.unityPackageUrl" type="success" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.avatar.tags.future_proofing') }}
                                     el-tag(v-if="avatarDialog.fileSize" type="info" effect="plain" size="mini" v-text="avatarDialog.fileSize" style="margin-right:5px")
                                     el-tag.x-link(v-if="avatarDialog.inCache" type="info" effect="plain" size="mini" @click="openFolderGeneric(avatarDialog.cachePath)")
diff --git a/html/src/localization/en/en.json b/html/src/localization/en/en.json
index d4adea6e..8ab7e790 100644
--- a/html/src/localization/en/en.json
+++ b/html/src/localization/en/en.json
@@ -721,6 +721,7 @@
                 "public": "Public",
                 "private": "Private",
                 "fallback": "Fallback",
+                "impostor": "Impostor",
                 "future_proofing": "Future Proofing",
                 "cache": "Cache",
                 "content_horror": "Horror",