diff --git a/BetterPartyFinder/BetterPartyFinder.csproj b/BetterPartyFinder/BetterPartyFinder.csproj
index d9c1fa2..b16858d 100755
--- a/BetterPartyFinder/BetterPartyFinder.csproj
+++ b/BetterPartyFinder/BetterPartyFinder.csproj
@@ -38,7 +38,7 @@
         <PackageReference Include="DalamudPackager" Version="1.2.1" />
         <PackageReference Include="Fody" Version="6.5.1" PrivateAssets="all" />
         <PackageReference Include="ILMerge.Fody" Version="1.16.0" PrivateAssets="all" />
-        <PackageReference Include="XivCommon" Version="1.1.0" />
+        <PackageReference Include="XivCommon" Version="1.3.0" />
     </ItemGroup>
 
 </Project>
diff --git a/BetterPartyFinder/Filter.cs b/BetterPartyFinder/Filter.cs
index 84e564d..610e341 100755
--- a/BetterPartyFinder/Filter.cs
+++ b/BetterPartyFinder/Filter.cs
@@ -96,8 +96,29 @@ namespace BetterPartyFinder {
                     var wanted = filter.Jobs[idx];
 
                     for (var i = 0; i < listing.SlotsAvailable; i++) {
-                        // if the slot isn't already full and the job can fit into it, add it to the set
-                        if (present[i] == 0 && slots[i][wanted]) {
+                        // if the slot is already full or the job can't fit into it, skip
+                        if (present[i] != 0 || !slots[i][wanted]) {
+                            continue;
+                        }
+
+                        // check for one player per job
+                        if (listing[SearchAreaFlags.OnePlayerPerJob]) {
+                            // make sure at least one job in the wanted set isn't taken
+                            foreach (var possibleJob in (JobFlags[]) Enum.GetValues(typeof(JobFlags))) {
+                                if (!wanted.HasFlag(possibleJob)) {
+                                    continue;
+                                }
+
+                                var job = possibleJob.ClassJob(this.Plugin.Interface.Data);
+                                if (present.Contains((byte) job.RowId)) {
+                                    continue;
+                                }
+
+                                jobs[idx].Add(i);
+                                break;
+                            }
+                        } else {
+                            // not one player per job
                             jobs[idx].Add(i);
                         }
                     }