diff --git a/html/src/app.js b/html/src/app.js
index 83d4bb93..d29a61b3 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -3481,10 +3481,10 @@ speechSynthesis.getVoices();
                 ++j;
             }
         }
-        // invite, requestInvite, friendRequest
         var { data } = this.notificationTable;
-        for (i = 0; i < data.length; i++) {
+        for (var i = 0; i < data.length; i++) {
             var ctx = data[i];
+            // invite, requestInvite, friendRequest
             if (ctx.senderUserId !== API.currentUser.id) {
                 arr.push({
                     ...ctx,
@@ -3493,17 +3493,22 @@ speechSynthesis.getVoices();
                 });
             }
         }
-        // TrustLevel, Friend, FriendRequest, Unfriend, DisplayName
         var { data } = this.friendLogTable;
-        var j = this.friendLogTable.data.length;
-        for (i = j - 1; i >= j - ((j > 10) ? 10 : j); i--) {
-            var ctx = data[i];
+        var i = data.length;
+        var j = 0;
+        while (j < 10) {
+            if (i <= 0) {
+                break;
+            }
+            var ctx = data[--i];
+            // TrustLevel, Friend, FriendRequest, Unfriend, DisplayName
             if (ctx.type !== 'FriendRequest') {
                 arr.push({
                     ...ctx,
                     isFriend: this.friends.has(ctx.userId),
                     isFavorite: API.cachedFavoritesByObjectId.has(ctx.userId)
                 });
+                ++j;
             }
         }
         arr.sort(function (a, b) {
diff --git a/html/src/vr.js b/html/src/vr.js
index 434c66b4..d31ba3fe 100644
--- a/html/src/vr.js
+++ b/html/src/vr.js
@@ -847,7 +847,7 @@ speechSynthesis.getVoices();
                         break;
                     }
                     if ((feedItem.created_at < bias) || (feedItem.type === 'Location') ||
-                        ((feedItem.type === 'GPS') && (feedItem.location !== ctx.location[0]) &&
+                        ((feedItem.type === 'GPS') && (feedItem.created_at !== ctx.created_at) &&
                         (feedItem.displayName === ctx.displayName))) {
                         break;
                     }