diff --git a/MareSynchronos/Services/DalamudUtilService.cs b/MareSynchronos/Services/DalamudUtilService.cs
index c4c49e0..9ae003a 100644
--- a/MareSynchronos/Services/DalamudUtilService.cs
+++ b/MareSynchronos/Services/DalamudUtilService.cs
@@ -54,7 +54,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         WorldData = new(() =>
         {
             return gameData.GetExcelSheet<Lumina.Excel.GeneratedSheets.World>(Dalamud.ClientLanguage.English)!
-                .Where(w => w.IsPublic && !w.Name.RawData.IsEmpty)
+                .Where(w => !w.Name.RawData.IsEmpty && w.DataCenter.Row != 0 && (w.IsPublic || char.IsUpper((char)w.Name.RawData[0])))
                 .ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString());
         });
         mediator.Subscribe<TargetPairMessage>(this, (msg) =>
diff --git a/MareSynchronos/Utils/VariousExtensions.cs b/MareSynchronos/Utils/VariousExtensions.cs
index 4b9612d..eafc4d3 100644
--- a/MareSynchronos/Utils/VariousExtensions.cs
+++ b/MareSynchronos/Utils/VariousExtensions.cs
@@ -150,6 +150,9 @@ public static class VariousExtensions
             oldData.CustomizePlusData.TryGetValue(objectKind, out var oldCustomizePlusData);
             newData.CustomizePlusData.TryGetValue(objectKind, out var newCustomizePlusData);
 
+            oldCustomizePlusData ??= string.Empty;
+            newCustomizePlusData ??= string.Empty;
+
             bool customizeDataDifferent = !string.Equals(oldCustomizePlusData, newCustomizePlusData, StringComparison.Ordinal);
             if (customizeDataDifferent || (forceApplyCustomization && !string.IsNullOrEmpty(newCustomizePlusData)))
             {