diff --git a/Assets/Resources/defaults.ini.txt b/Assets/Resources/defaults.ini.txt
index ffb1dfe247..fe5cae4be3 100644
--- a/Assets/Resources/defaults.ini.txt
+++ b/Assets/Resources/defaults.ini.txt
@@ -174,7 +174,8 @@ TerrainDistance=3
 TerrainHeightmapPixelError=5
 SmallerDungeons=False
 CustomBooksImport=True
-AssetCacheThreshold = 25
+AssetCacheThreshold=25
+DungeonsPoolSizeTarget=3
 
 [Enhancements]
 LypyL_GameConsole=True
diff --git a/Assets/Scripts/Game/Questing/Place.cs b/Assets/Scripts/Game/Questing/Place.cs
index b2652a78e3..c735fcffd7 100644
--- a/Assets/Scripts/Game/Questing/Place.cs
+++ b/Assets/Scripts/Game/Questing/Place.cs
@@ -42,6 +42,8 @@ public class Place : QuestResource
         int p1;                     // Parameter 1
         int p2;                     // Parameter 2
         int p3;                     // Parameter 3
+        int[] alternateDungeonTypeIndices; // DFU extension for remote dungeons
+        bool listedSitesOnly;              // DFU extension for remote dungeons
 
         SiteDetails siteDetails;    // Site found using inputs
 
@@ -143,8 +145,7 @@ public override void SetResource(string line)
             base.SetResource(line);
 
             // Match string for Place variants
-            string matchStr = @"(Place|place) (?<symbol>[a-zA-Z0-9_.-]+) (?<siteType>local|remote|permanent) (?<siteName>\w+)|" +
-                              @"(Place|place) (?<symbol>[a-zA-Z0-9_.-]+) (?<siteType>randompermanent) (?<siteList>[a-zA-Z0-9_.,]+)";
+            string matchStr = @"(Place|place) (?<symbol>[a-zA-Z0-9_.-]+) (?<siteType>local|remote|permanent|randompermanent) (?<siteList>[a-zA-Z0-9_.,]+)(?<only> only)?";
 
             // Try to match source line with pattern
             bool randomSiteList = false;
@@ -182,22 +183,26 @@ public override void SetResource(string line)
                     throw new Exception(string.Format("Place found no site type match found for source: '{0}'. Must be local|remote|permanent.", line));
                 }
 
+                string only = match.Groups["only"].Value;
+                listedSitesOnly = (string.Compare(only, " only", true) == 0);
+
                 // Get place name for parameter lookup
-                name = match.Groups["siteName"].Value;
-                if (string.IsNullOrEmpty(name) && !randomSiteList)
-                {
-                    throw new Exception(string.Format("Place site name empty for source: '{0}'", line));
-                }
+                string srcSiteList = match.Groups["siteList"].Value;
+                string[] siteNames = srcSiteList.Split(',');
 
                 // Pick one permanent place from random site list
                 if (randomSiteList)
                 {
-                    string srcSiteList = match.Groups["siteList"].Value;
-                    string[] siteNames = srcSiteList.Split(',');
                     if (siteNames == null || siteNames.Length == 0)
                         throw new Exception(string.Format("Place randompermanent must have at least one site name in source: '{0}'", line));
                     name = siteNames[UnityEngine.Random.Range(0, siteNames.Length)];
                 }
+                else // !randomSiteList
+                {
+                    if (siteNames == null || siteNames.Length == 0)
+                        throw new Exception(string.Format("Place site name empty for source: '{0}'", line));
+                    name = siteNames[0];
+                }
 
                 // Try to read place variables from data table
                 Table placesTable = QuestMachine.Instance.PlacesTable;
@@ -213,6 +218,24 @@ public override void SetResource(string line)
                     throw new Exception(string.Format("Could not find place name in data table: '{0}'", name));
                 }
 
+                // Alternate places (used for remote dungeon types)
+                if (siteNames.Length > 1)
+                {
+                    alternateDungeonTypeIndices = new int[siteNames.Length - 1];
+                    for (int i = 1; i < siteNames.Length; i++)
+                    {
+                        if (placesTable.HasValue(siteNames[i]))
+                        {
+                            // Store value
+                            alternateDungeonTypeIndices[i - 1] = CustomParseInt(placesTable.GetValue("p2", siteNames[i]));
+                        }
+                        else
+                        {
+                            throw new Exception(string.Format("Could not find place name in data table: '{0}'", siteNames[i]));
+                        }
+                    }
+                }
+
                 // Handle place by scope
                 if (scope == Scopes.Local)
                 {
@@ -770,10 +793,6 @@ void SetupRemoteSite(string line)
                     throw new Exception(string.Format("An unknown P1 value of {0} was encountered for Place {1}", p1, Symbol.Original));
             }
 
-            // If searching for a dungeon and first numbered choice not found, then try again with any random dungeon type
-            if (!result && p1 == 1)
-                result = SelectRemoteDungeonSite(-1);
-
             // Throw exception when remote place could not be selected, e.g. a dungeon of that type does not exist in this region
             if (!result)
                 throw new Exception(string.Format("Search failed to locate matching remote site for Place {0} in region {1}. Resource source: '{2}'", Symbol.Original, GameManager.Instance.PlayerGPS.CurrentRegionName, line));
@@ -893,14 +912,53 @@ bool SelectRemoteDungeonSite(int dungeonTypeIndex)
 
             // Get indices for all dungeons of this type
             int[] foundIndices = CollectDungeonIndicesOfType(regionData, dungeonTypeIndex);
+
+            //Debug.LogFormat("Found a total of {0} possible dungeons of type {1} in {2}", foundIndices == null ? 0 : foundIndices.Length, dungeonTypeIndex, regionData.Name);
+
+            if (dungeonTypeIndex >= 0)
+            {
+                int equivalentIndex = 0;
+                if (foundIndices == null)
+                {
+                    foundIndices = new int[] {};
+                }
+                // Add equivalence(s) if too few dungeons to select from
+                while (foundIndices.Length < DaggerfallUnity.Settings.DungeonsPoolSizeTarget)
+                {
+                    Debug.LogFormat("Dungeon candidates list too short ({}) for proper randomization", foundIndices.Length);
+                    if (alternateDungeonTypeIndices != null && alternateDungeonTypeIndices.Length > equivalentIndex)
+                    {
+                        int[] equivalentIndices = CollectDungeonIndicesOfType(regionData, alternateDungeonTypeIndices[equivalentIndex]);
+                        if (equivalentIndices != null && equivalentIndices.Length > 0)
+                        {
+                            Debug.LogFormat("Adding {0} possible dungeons of type {1} by equivalence", equivalentIndices.Length, alternateDungeonTypeIndices[equivalentIndex]);
+                            foundIndices = foundIndices.Concat(equivalentIndices).ToArray();
+                        }
+                        equivalentIndex++;
+                    }
+                    else
+                    {
+                        if (!listedSitesOnly)
+                        {
+                            // If everything failed, pick any dungeon (DFU classic behavior)
+                            Debug.LogFormat("Falling back to picking any dungeon (classic DFU behavior)");
+                            foundIndices = CollectDungeonIndicesOfType(regionData, -1);
+                        }
+                        else
+                        {
+                            Debug.LogFormat("No dungeon types fallback, continuing with available pool");
+                        }
+                        break;
+                    }
+                }
+            }
+
             if (foundIndices == null || foundIndices.Length == 0)
             {
                 Debug.LogFormat("Could not find any random dungeons of type {0} in {1}", dungeonTypeIndex, regionData.Name);
                 return false;
             }
 
-            //Debug.LogFormat("Found a total of {0} possible dungeons of type {1} in {2}", foundIndices.Length, dungeonTypeIndex, regionData.Name);
-
             // Select a random dungeon location index from available list
             int index = UnityEngine.Random.Range(0, foundIndices.Length);
 
diff --git a/Assets/Scripts/SettingsManager.cs b/Assets/Scripts/SettingsManager.cs
index 88b0c82d8b..886825324f 100644
--- a/Assets/Scripts/SettingsManager.cs
+++ b/Assets/Scripts/SettingsManager.cs
@@ -327,6 +327,7 @@ string ReadDistributionSuffix()
         public float TerrainHeightmapPixelError { get; set; }
         public bool SmallerDungeons { get; set; }
         public int AssetCacheThreshold { get; set; }
+        public int DungeonsPoolSizeTarget { get; set; }
 
         // [Enhancements]
         public bool LypyL_GameConsole { get; set; }
@@ -563,6 +564,7 @@ public void LoadSettings()
             TerrainHeightmapPixelError = GetFloat(sectionExperimental, "TerrainHeightmapPixelError", 1, 10);
             SmallerDungeons = GetBool(sectionExperimental, "SmallerDungeons");
             AssetCacheThreshold = GetInt(sectionExperimental, "AssetCacheThreshold", 0, 120);
+            DungeonsPoolSizeTarget = GetInt(sectionExperimental, "DungeonsPoolSizeTarget", 0, 999);
 
             LypyL_GameConsole = GetBool(sectionEnhancements, "LypyL_GameConsole");
             LypyL_ModSystem = GetBool(sectionEnhancements, "LypyL_ModSystem");
@@ -758,6 +760,7 @@ public void SaveSettings()
             SetFloat(sectionExperimental, "TerrainHeightmapPixelError", TerrainHeightmapPixelError);
             SetBool(sectionExperimental, "SmallerDungeons", SmallerDungeons);
             SetInt(sectionExperimental, "AssetCacheThreshold", AssetCacheThreshold);
+            SetInt(sectionExperimental, "DungeonsPoolSizeTarget", DungeonsPoolSizeTarget);
 
             SetBool(sectionEnhancements, "LypyL_GameConsole", LypyL_GameConsole);
             SetBool(sectionEnhancements, "LypyL_ModSystem", LypyL_ModSystem);
diff --git a/Assets/StreamingAssets/Quests/$CUREVAM.txt b/Assets/StreamingAssets/Quests/$CUREVAM.txt
index bf4f4cc941..d41c514add 100644
--- a/Assets/StreamingAssets/Quests/$CUREVAM.txt
+++ b/Assets/StreamingAssets/Quests/$CUREVAM.txt
@@ -240,8 +240,8 @@ Person _vamp1_ face 40 factiontype Vampire_Clan remote
 Person _vamp2_ face 4 factiontype Vampire_Clan male remote
 Person _hunter_ face 1 factiontype Knightly_Guard remote anyInfo 1011 rumors 1012
 
-Place _fatherdung_ remote dungeon8
-Place _wrongdung_ remote dungeon5
+Place _fatherdung_ remote dungeon8 only
+Place _wrongdung_ remote dungeon5,dungeon6 only
 
 Clock _S.10_ 1.00:00 2.22:00
 Clock _S.13_ 7.00:00 27.23:40
diff --git a/Assets/StreamingAssets/Quests/$CUREWER.txt b/Assets/StreamingAssets/Quests/$CUREWER.txt
index 8593b4ef8b..65db47f10c 100644
--- a/Assets/StreamingAssets/Quests/$CUREWER.txt
+++ b/Assets/StreamingAssets/Quests/$CUREWER.txt
@@ -338,10 +338,10 @@ Person _alchemist_ group Chemist remote
 Person _father_ face 5 group Noble male remote anyInfo 1013 rumors 1014
 Person _local_ group Resident1 remote
 
-Place _mapdung_ remote dungeon4
+Place _mapdung_ remote dungeon4,dungeon7 only
 Place glenmorilCoven permanent GlenmorilCoven
 Place _childhouse_ remote house2
-Place _hintdung_ remote dungeon11
+Place _hintdung_ remote dungeon11,dungeon2 only
 
 Clock _S.05_ 7.00:00 27.23:40
 Clock _huntstart_ 60.00:00 0
diff --git a/Assets/StreamingAssets/Quests/00B00Y00.txt b/Assets/StreamingAssets/Quests/00B00Y00.txt
index 678a1ea84f..4e63a97103 100644
--- a/Assets/StreamingAssets/Quests/00B00Y00.txt
+++ b/Assets/StreamingAssets/Quests/00B00Y00.txt
@@ -95,7 +95,7 @@ Item _reward_ gold
 
 Person _questgiver_ group Questor
 
-Place _mondung_ remote dungeon9
+Place _mondung_ remote dungeon9 only
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/20C00Y00.txt b/Assets/StreamingAssets/Quests/20C00Y00.txt
index 09072bab1a..40904fe329 100644
--- a/Assets/StreamingAssets/Quests/20C00Y00.txt
+++ b/Assets/StreamingAssets/Quests/20C00Y00.txt
@@ -135,9 +135,9 @@ Person _questgiver_ face 112 named Molag_Bal anyInfo 1011
 Person _contact_ face 233 faction The_Cabal remote anyInfo 1012
 Person _dummy_ face 1 group Spellcaster remote
 
-Place _mondung_ remote dungeon9
+Place _mondung_ remote dungeon9 only
 Place _tavern_ remote tavern
-Place _hideout_ remote dungeon11
+Place _hideout_ remote dungeon11,dungeon2 only
 
 Clock _1stparton_ 00:00 0 flag 1 range 0 5
 Clock _S.08_ 00:01 00:04
diff --git a/Assets/StreamingAssets/Quests/70C00Y00.txt b/Assets/StreamingAssets/Quests/70C00Y00.txt
index ada133d251..46f80bb532 100644
--- a/Assets/StreamingAssets/Quests/70C00Y00.txt
+++ b/Assets/StreamingAssets/Quests/70C00Y00.txt
@@ -131,7 +131,7 @@ Item _artifact_ artifact Sanguine_Rose anyInfo 1014
 Person _questgiver_ face 112 named Sanguine anyInfo 1011
 Person _contact_ face 232 faction The_Cabal remote anyInfo 1012
 
-Place _mondung_ remote dungeon4
+Place _mondung_ remote dungeon4,dungeon7 only
 
 Clock _1stparton_ 00:00 0 flag 1 range 2 5
 
diff --git a/Assets/StreamingAssets/Quests/A0C0XY04.txt b/Assets/StreamingAssets/Quests/A0C0XY04.txt
index 9d434ea11f..2962344c5b 100644
--- a/Assets/StreamingAssets/Quests/A0C0XY04.txt
+++ b/Assets/StreamingAssets/Quests/A0C0XY04.txt
@@ -179,7 +179,7 @@ Person _dummymage_ face 1 faction The_Mages_Guild remote
 Person _dummyorc_ face 1 named Gortwog
 Person _dummydarkb_ face 49 faction The_Dark_Brotherhood remote
 
-Place _dungeon_ remote dungeon7
+Place _dungeon_ remote dungeon7,dungeon4
 Place _meetingplace_ local apothecary
 
 Clock _extratime_ 00:30 0 flag 1 range 0 1
diff --git a/Assets/StreamingAssets/Quests/A0C41Y18.txt b/Assets/StreamingAssets/Quests/A0C41Y18.txt
index 0c4746e72a..2b8b119e62 100644
--- a/Assets/StreamingAssets/Quests/A0C41Y18.txt
+++ b/Assets/StreamingAssets/Quests/A0C41Y18.txt
@@ -187,7 +187,7 @@ Person _sage_ group Cleric remote anyInfo 1050 rumors 1050
 Person _giver_ group Questor
 Person _dummy_ group Innkeeper remote
 
-Place _dungeon_ remote dungeon0
+Place _dungeon_ remote dungeon0 only
 
 Clock _S.10_ 1001.00:00 0 flag 1 range 0 1
 
diff --git a/Assets/StreamingAssets/Quests/B0B20Y07.txt b/Assets/StreamingAssets/Quests/B0B20Y07.txt
index 46894c3668..4d6be3c3d5 100644
--- a/Assets/StreamingAssets/Quests/B0B20Y07.txt
+++ b/Assets/StreamingAssets/Quests/B0B20Y07.txt
@@ -108,7 +108,7 @@ QBN:
 Person _qgiver_ group Questor
 Person _local_ face 1 group Resident2 local
 
-Place _dungeon_ remote dungeon1
+Place _dungeon_ remote dungeon1 only
 
 Clock _2dung_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/B0B50Y11.txt b/Assets/StreamingAssets/Quests/B0B50Y11.txt
index aca5dc7ebf..f521a6576f 100644
--- a/Assets/StreamingAssets/Quests/B0B50Y11.txt
+++ b/Assets/StreamingAssets/Quests/B0B50Y11.txt
@@ -91,7 +91,7 @@ Person _qgiver_ group Questor
 Person _nobleman_ face 182 factiontype Province remote
 Person _local_ face 77 group Resident2 male local
 
-Place _dungeon_ remote dungeon11
+Place _dungeon_ remote dungeon11 only
 
 Clock _2dung_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/B0B70Y14.txt b/Assets/StreamingAssets/Quests/B0B70Y14.txt
index dea523dff6..2031d253e2 100644
--- a/Assets/StreamingAssets/Quests/B0B70Y14.txt
+++ b/Assets/StreamingAssets/Quests/B0B70Y14.txt
@@ -131,7 +131,7 @@ Item _gold_ gold
 
 Person _qgiver_ group Questor
 
-Place _dungeon_ remote dungeon7
+Place _dungeon_ remote dungeon7,dungeon4
 
 Clock _2dung_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/B0B70Y16.txt b/Assets/StreamingAssets/Quests/B0B70Y16.txt
index 11c174b65f..f487c1e8be 100644
--- a/Assets/StreamingAssets/Quests/B0B70Y16.txt
+++ b/Assets/StreamingAssets/Quests/B0B70Y16.txt
@@ -131,7 +131,7 @@ QBN:
 Person _qgiver_ group Questor
 Person _local_ face 93 group Resident2 male local
 
-Place _dungeon_ remote dungeon14
+Place _dungeon_ remote dungeon14 only
 
 Clock _2dung_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/B0B80Y17.txt b/Assets/StreamingAssets/Quests/B0B80Y17.txt
index 2767aac0ec..03d0870553 100644
--- a/Assets/StreamingAssets/Quests/B0B80Y17.txt
+++ b/Assets/StreamingAssets/Quests/B0B80Y17.txt
@@ -95,7 +95,7 @@ QBN:
 Person _qgiver_ group Questor
 Person _local_ face 1 group Resident2 local
 
-Place _dungeon_ remote dungeon0
+Place _dungeon_ remote dungeon0,dungeon11
 
 Clock _2dung_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/B0B81Y02.txt b/Assets/StreamingAssets/Quests/B0B81Y02.txt
index 8f42e8a908..05fdb3efa1 100644
--- a/Assets/StreamingAssets/Quests/B0B81Y02.txt
+++ b/Assets/StreamingAssets/Quests/B0B81Y02.txt
@@ -228,7 +228,7 @@ Person _wizard_ face 1 group Spellcaster remote
 Place _dungeon_ remote dungeon
 Place _dungeon2_ remote dungeon
 Place _mageguild_ remote magery
-Place _dungeon3_ remote dungeon0
+Place _dungeon3_ remote dungeon0,dungeon11 only
 
 Clock _2dung_ 00:00 0 flag 17 range 0 2
 Clock _S.30_ 180.13:20 0 flag 1 range 0 1
diff --git a/Assets/StreamingAssets/Quests/B0C00Y10.txt b/Assets/StreamingAssets/Quests/B0C00Y10.txt
index 8bc31c5350..8030999b6d 100644
--- a/Assets/StreamingAssets/Quests/B0C00Y10.txt
+++ b/Assets/StreamingAssets/Quests/B0C00Y10.txt
@@ -95,7 +95,7 @@ QBN:
 Person _qgiver_ group Questor
 Person _local_ face 1 group Resident2 local
 
-Place _dungeon_ remote dungeon1
+Place _dungeon_ remote dungeon1 only
 
 Clock _2dung_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/C0B00Y01.txt b/Assets/StreamingAssets/Quests/C0B00Y01.txt
index bfc0cd3689..77a868e873 100644
--- a/Assets/StreamingAssets/Quests/C0B00Y01.txt
+++ b/Assets/StreamingAssets/Quests/C0B00Y01.txt
@@ -471,7 +471,7 @@ Person _prophet_ face 1 group Local_4.0 anyInfo 1038
 Person _replace_ face 3 factiontype Temple female anyInfo 1023
 Person _lover_ face 104 group Group_7.0 remote anyInfo 1017
 
-Place _mondung_ remote dungeon4
+Place _mondung_ remote dungeon4,dungeon7 only
 Place _tavern_ remote tavern
 Place _prophouse_ remote tavern
 
diff --git a/Assets/StreamingAssets/Quests/C0B00Y03.txt b/Assets/StreamingAssets/Quests/C0B00Y03.txt
index 652d4136a0..36eee31344 100644
--- a/Assets/StreamingAssets/Quests/C0B00Y03.txt
+++ b/Assets/StreamingAssets/Quests/C0B00Y03.txt
@@ -118,7 +118,7 @@ QBN:
 Person _qgiver_ group Questor
 Person _cleric_ face 105 factiontype Temple
 
-Place _mondung_ remote dungeon4
+Place _mondung_ remote dungeon4,dungeon7
 
 Clock _queston_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/C0B00Y14.txt b/Assets/StreamingAssets/Quests/C0B00Y14.txt
index c6a7f208d7..4641579676 100644
--- a/Assets/StreamingAssets/Quests/C0B00Y14.txt
+++ b/Assets/StreamingAssets/Quests/C0B00Y14.txt
@@ -146,7 +146,7 @@ Item _I.00_ item class 10 subclass 4
 Person _questgiver_ group Questor
 Person _priest_ group Cleric remote
 
-Place _mondung_ remote dungeon4
+Place _mondung_ remote dungeon4,dungeon7 only
 
 Clock _qtime_ 00:00 0 flag 17 range 1 5
 
diff --git a/Assets/StreamingAssets/Quests/E0B00Y00.txt b/Assets/StreamingAssets/Quests/E0B00Y00.txt
index a96f4bf6f3..ff4d7ac70f 100644
--- a/Assets/StreamingAssets/Quests/E0B00Y00.txt
+++ b/Assets/StreamingAssets/Quests/E0B00Y00.txt
@@ -124,7 +124,7 @@ Item _reward_ gold
 
 Person _questgiver_ group Questor
 
-Place _mondung_ remote dungeon4
+Place _mondung_ remote dungeon4,dungeon7
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/H0B00Y00.txt b/Assets/StreamingAssets/Quests/H0B00Y00.txt
index 2d3ac857fe..9f61bd75e0 100644
--- a/Assets/StreamingAssets/Quests/H0B00Y00.txt
+++ b/Assets/StreamingAssets/Quests/H0B00Y00.txt
@@ -100,7 +100,7 @@ Item _reward_ gold
 
 Person _questgiver_ group Questor
 
-Place _mondung_ remote dungeon4
+Place _mondung_ remote dungeon4,dungeon7 only
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/K0C00Y02.txt b/Assets/StreamingAssets/Quests/K0C00Y02.txt
index bc8ce0ea3e..b40c96295b 100644
--- a/Assets/StreamingAssets/Quests/K0C00Y02.txt
+++ b/Assets/StreamingAssets/Quests/K0C00Y02.txt
@@ -137,7 +137,7 @@ Item _I.07_ gold
 Person _qgiver_ group Questor
 
 Place _depository_ remote bank
-Place _mondung_ remote dungeon2
+Place _mondung_ remote dungeon2,dungeon15 only
 Place _palace_ remote palace
 Place _mansion_ remote house1
 
diff --git a/Assets/StreamingAssets/Quests/K0C00Y05.txt b/Assets/StreamingAssets/Quests/K0C00Y05.txt
index 1812087307..f0df88b0e4 100644
--- a/Assets/StreamingAssets/Quests/K0C00Y05.txt
+++ b/Assets/StreamingAssets/Quests/K0C00Y05.txt
@@ -211,7 +211,7 @@ Person _qgiver_ group Questor
 Person _knight_ face 216 faction The_Fighters_Guild remote
 Person _child_ faction Children female
 
-Place _mondung_ remote dungeon1
+Place _mondung_ remote dungeon1 only
 Place _childlocale_ local house2
 
 Clock _queston_ 00:00 0 flag 17 range 0 5
diff --git a/Assets/StreamingAssets/Quests/K0C01Y00.txt b/Assets/StreamingAssets/Quests/K0C01Y00.txt
index 7daa901f6f..5ce56cb2f2 100644
--- a/Assets/StreamingAssets/Quests/K0C01Y00.txt
+++ b/Assets/StreamingAssets/Quests/K0C01Y00.txt
@@ -194,7 +194,7 @@ Person _victim_ face 1 group Group_7.0
 Person _tg_ faction The_Thieves_Guild local
 
 Place _mondung_ remote dungeon
-Place _mondung2_ remote dungeon2
+Place _mondung2_ remote dungeon2,dungeon15 only
 
 Clock _queston1_ 00:00 0 flag 17 range 0 2
 Clock _S.05_ 08:20 3.11:20
diff --git a/Assets/StreamingAssets/Quests/K0C01Y10.txt b/Assets/StreamingAssets/Quests/K0C01Y10.txt
index 8ddf77ba39..76154d6ae6 100644
--- a/Assets/StreamingAssets/Quests/K0C01Y10.txt
+++ b/Assets/StreamingAssets/Quests/K0C01Y10.txt
@@ -189,7 +189,7 @@ Item _bothdorjii_ letter used 1011
 
 Person _qgiver_ group Questor
 
-Place _mondung_ remote dungeon4
+Place _mondung_ remote dungeon4,dungeon7 only
 
 Clock _queston_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/K0C0XY01.txt b/Assets/StreamingAssets/Quests/K0C0XY01.txt
index f3a7b2914f..3622cbb275 100644
--- a/Assets/StreamingAssets/Quests/K0C0XY01.txt
+++ b/Assets/StreamingAssets/Quests/K0C0XY01.txt
@@ -194,7 +194,7 @@ Item _jewelry_ trinket
 Person _qgiver_ group Questor
 Person _contact_ face 1 faction The_Fighters_Guild remote
 
-Place _mondung_ remote dungeon10
+Place _mondung_ remote dungeon10 only
 
 Clock _2mondung_ 00:00 0 flag 17 range 0 2
 Clock _S.05_ 16:40 1.09:20
diff --git a/Assets/StreamingAssets/Quests/L0B00Y02.txt b/Assets/StreamingAssets/Quests/L0B00Y02.txt
index 00dd2eee11..920c754c65 100644
--- a/Assets/StreamingAssets/Quests/L0B00Y02.txt
+++ b/Assets/StreamingAssets/Quests/L0B00Y02.txt
@@ -149,7 +149,7 @@ Item _letter_ letter used 1011
 Person _qgiver_ face 110 group Questor
 
 Place _mondung_ remote dungeon
-Place _stronghold_ remote dungeon2
+Place _stronghold_ remote dungeon2,dungeon15 only
 
 Clock _queston_ 00:00 0 flag 17 range 0 5
 
diff --git a/Assets/StreamingAssets/Quests/L0B20Y02.txt b/Assets/StreamingAssets/Quests/L0B20Y02.txt
index db073acef9..274f5f65fe 100644
--- a/Assets/StreamingAssets/Quests/L0B20Y02.txt
+++ b/Assets/StreamingAssets/Quests/L0B20Y02.txt
@@ -111,7 +111,7 @@ Item _reward_ gold
 Person _questgiver_ face 112 group Questor
 Person _damsel_ face 2 group Group_6.0 female local
 
-Place _mondung_ remote dungeon2
+Place _mondung_ remote dungeon2,dungeon15 only
 
 Clock _1stparton_ 00:00 0 flag 18 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/M0B00Y17.txt b/Assets/StreamingAssets/Quests/M0B00Y17.txt
index b09f1d1d2f..1937c492e9 100644
--- a/Assets/StreamingAssets/Quests/M0B00Y17.txt
+++ b/Assets/StreamingAssets/Quests/M0B00Y17.txt
@@ -208,7 +208,7 @@ Person _victim_ face 1 group Group_6.0 remote
 Person _love_ face 1 group Group_7.0 remote
 Person _dummy_ group Noble local
 
-Place _mondung_ remote dungeon6
+Place _mondung_ remote dungeon6,dungeon5 only
 Place _newdung_ remote dungeon
 --unneeded dungeon variable
 Place _lovehouse_ local house2
diff --git a/Assets/StreamingAssets/Quests/M0B11Y18.txt b/Assets/StreamingAssets/Quests/M0B11Y18.txt
index a0a371ab3b..e6a11f01c6 100644
--- a/Assets/StreamingAssets/Quests/M0B11Y18.txt
+++ b/Assets/StreamingAssets/Quests/M0B11Y18.txt
@@ -338,7 +338,7 @@ Person _enemy_ face 1 group Resident2 remote
 Person _traitor_ face 1 named Lord_K'avar
 
 Place _L.00_ remote dungeon
-Place _stronghold_ remote dungeon2
+Place _stronghold_ remote dungeon2,dungeon15 only
 Place _tavern_ local tavern
 Place _targethouse_ local house2
 Place _palace_ remote palace
diff --git a/Assets/StreamingAssets/Quests/M0B1XY01.txt b/Assets/StreamingAssets/Quests/M0B1XY01.txt
index 288adf077f..61657d27a9 100644
--- a/Assets/StreamingAssets/Quests/M0B1XY01.txt
+++ b/Assets/StreamingAssets/Quests/M0B1XY01.txt
@@ -108,7 +108,7 @@ Item _reward_ gold
 
 Person _questgiver_ group Questor
 
-Place _mondung_ remote dungeon10
+Place _mondung_ remote dungeon
 Place _newdung_ remote dungeon
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
diff --git a/Assets/StreamingAssets/Quests/M0B20Y02.txt b/Assets/StreamingAssets/Quests/M0B20Y02.txt
index 8036469bea..24a40a661c 100644
--- a/Assets/StreamingAssets/Quests/M0B20Y02.txt
+++ b/Assets/StreamingAssets/Quests/M0B20Y02.txt
@@ -113,7 +113,7 @@ Item _reward_ gold
 
 Person _questgiver_ group Questor
 
-Place _mondung_ remote dungeon13
+Place _mondung_ remote dungeon13 only
 Place _newdung_ remote dungeon
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
diff --git a/Assets/StreamingAssets/Quests/M0B30Y04.txt b/Assets/StreamingAssets/Quests/M0B30Y04.txt
index 5f1a9cd70e..f051ea3984 100644
--- a/Assets/StreamingAssets/Quests/M0B30Y04.txt
+++ b/Assets/StreamingAssets/Quests/M0B30Y04.txt
@@ -117,7 +117,7 @@ Item _reward_ gold
 Person _questgiver_ group Questor
 
 Place _mondung_ remote dungeon
-Place _newdung_ remote dungeon14
+Place _newdung_ remote dungeon14 only
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/M0B50Y09.txt b/Assets/StreamingAssets/Quests/M0B50Y09.txt
index 82952e58c7..74a03cadc5 100644
--- a/Assets/StreamingAssets/Quests/M0B50Y09.txt
+++ b/Assets/StreamingAssets/Quests/M0B50Y09.txt
@@ -96,7 +96,7 @@ Item _gold_ gold
 Person _qgiver_ group Questor
 
 Place _dungeon_ remote dungeon
-Place _newdung_ remote dungeon8
+Place _newdung_ remote dungeon8 only
 
 Clock _2dung_ 00:00 0 flag 17 range 0 2
 Clock _end_ 00:00
diff --git a/Assets/StreamingAssets/Quests/N0B20Y05.txt b/Assets/StreamingAssets/Quests/N0B20Y05.txt
index 69e6df9625..7041b2ce24 100644
--- a/Assets/StreamingAssets/Quests/N0B20Y05.txt
+++ b/Assets/StreamingAssets/Quests/N0B20Y05.txt
@@ -122,7 +122,7 @@ Item _reward_ magic_item
 Person _questgiver_ group Questor
 Person _wizard_ face 249 faction The_Mages_Guild remote
 
-Place _mondung_ remote dungeon9
+Place _mondung_ remote dungeon9 only
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/N0B40Y07.txt b/Assets/StreamingAssets/Quests/N0B40Y07.txt
index 5de51a1e91..840e006e2b 100644
--- a/Assets/StreamingAssets/Quests/N0B40Y07.txt
+++ b/Assets/StreamingAssets/Quests/N0B40Y07.txt
@@ -155,7 +155,7 @@ Item _spellScroll_ letter used 1030
 Person _qgiver_ group Questor
 Person _dummydaedra_ face 249 factiontype Daedra remote
 
-Place _mondung_ remote dungeon9
+Place _mondung_ remote dungeon9 only
 Place aide remote dungeon
 
 Clock _queston_ 00:00 0 flag 17 range 0 2
diff --git a/Assets/StreamingAssets/Quests/P0A01L00.txt b/Assets/StreamingAssets/Quests/P0A01L00.txt
index bc512ac526..9b37267dff 100644
--- a/Assets/StreamingAssets/Quests/P0A01L00.txt
+++ b/Assets/StreamingAssets/Quests/P0A01L00.txt
@@ -133,7 +133,7 @@ Item _letter_ letter used QuestorOffer
 
 Person _questgiver_ factiontype Vampire_Clan remote anyInfo 1010 rumors 1011
 
-Place _mondung_ remote dungeon0
+Place _mondung_ remote dungeon0 only
 
 Clock _1stparton_ 00:00 0 flag 1 range 2 5
 
diff --git a/Assets/StreamingAssets/Quests/P0B00L03.txt b/Assets/StreamingAssets/Quests/P0B00L03.txt
index 47c804538d..39f2efd605 100644
--- a/Assets/StreamingAssets/Quests/P0B00L03.txt
+++ b/Assets/StreamingAssets/Quests/P0B00L03.txt
@@ -169,7 +169,7 @@ Item _letter_ letter used 1020
 Person _vampire_ face 40 factiontype Vampire_Clan local anyInfo 1011 rumors 1012
 Person _vampname_ face 4 factiontype Vampire_Clan male remote
 
-Place _mondung_ remote dungeon8
+Place _mondung_ remote dungeon8 only
 
 Clock _1stparton_ 00:00 0 flag 1 range 2 5
 
diff --git a/Assets/StreamingAssets/Quests/P0B00L06.txt b/Assets/StreamingAssets/Quests/P0B00L06.txt
index f07ba0bcb9..04f6b08609 100644
--- a/Assets/StreamingAssets/Quests/P0B00L06.txt
+++ b/Assets/StreamingAssets/Quests/P0B00L06.txt
@@ -268,7 +268,7 @@ Person _vamp_ factiontype Vampire_Clan local
 Person _mg_ faction The_Mages_Guild local
 Person _mage_ face 1 group Group_5.1 remote
 
-Place _mondung_ remote dungeon9
+Place _mondung_ remote dungeon9 only
 
 Clock _queston_ 00:00 0 flag 17 range 0 2
 Clock _2ndparton_ 00:10 00:30 flag 9 range 0 0
diff --git a/Assets/StreamingAssets/Quests/P0B10L07.txt b/Assets/StreamingAssets/Quests/P0B10L07.txt
index af592dfe9c..cc70aeab53 100644
--- a/Assets/StreamingAssets/Quests/P0B10L07.txt
+++ b/Assets/StreamingAssets/Quests/P0B10L07.txt
@@ -159,7 +159,7 @@ Item _jewelry_ trinket
 Person _vamp_ factiontype Vampire_Clan local
 Person _knight_ face 69 factiontype Knightly_Guard male remote
 
-Place _mondung_ remote dungeon2
+Place _mondung_ remote dungeon2,dungeon15 only
 
 Clock _queston_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/P0B10L08.txt b/Assets/StreamingAssets/Quests/P0B10L08.txt
index f725861ef3..2edf20ac4c 100644
--- a/Assets/StreamingAssets/Quests/P0B10L08.txt
+++ b/Assets/StreamingAssets/Quests/P0B10L08.txt
@@ -194,7 +194,7 @@ Item _gem_ gem
 Person _vamp_ factiontype Vampire_Clan local
 Person _daedra_ face 1 factiontype Daedra remote
 
-Place _mondung_ remote dungeon7
+Place _mondung_ remote dungeon7,dungeon4 only
 
 Clock _queston_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/Q0C00Y06.txt b/Assets/StreamingAssets/Quests/Q0C00Y06.txt
index 4063464f3f..9cd0b91357 100644
--- a/Assets/StreamingAssets/Quests/Q0C00Y06.txt
+++ b/Assets/StreamingAssets/Quests/Q0C00Y06.txt
@@ -120,7 +120,7 @@ Item _reward_ magic_item
 
 Person _witch_ face 44 group Questor anyInfo 1011 rumors 1012
 
-Place _mondung_ remote dungeon8
+Place _mondung_ remote dungeon8 only
 --removed extraneous underscore from __mondung_.
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
diff --git a/Assets/StreamingAssets/Quests/Q0C00Y07.txt b/Assets/StreamingAssets/Quests/Q0C00Y07.txt
index 4e0261cdcf..af8a943f95 100644
--- a/Assets/StreamingAssets/Quests/Q0C00Y07.txt
+++ b/Assets/StreamingAssets/Quests/Q0C00Y07.txt
@@ -114,7 +114,7 @@ Person _qgiver_ group Questor
 Person _witch_ face 1 faction The_Prostitutes female remote
 Person _daedra_ face 105 factiontype Daedra
 
-Place _mondung_ remote dungeon3
+Place _mondung_ remote dungeon3 only
 
 Clock _queston_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/Q0C10Y00.txt b/Assets/StreamingAssets/Quests/Q0C10Y00.txt
index 58190985aa..ddb5580374 100644
--- a/Assets/StreamingAssets/Quests/Q0C10Y00.txt
+++ b/Assets/StreamingAssets/Quests/Q0C10Y00.txt
@@ -140,9 +140,9 @@ Item _reward3_ jade
 
 Person _qgiver_ group Questor anyInfo 1011
 
-Place _dungeon1_ remote dungeon6
-Place _dungeon2_ remote dungeon12
-Place _dungeon3_ remote dungeon10
+Place _dungeon1_ remote dungeon6,dungeon5 only
+Place _dungeon2_ remote dungeon12 only
+Place _dungeon3_ remote dungeon10 only
 
 Clock _queston_ 6.22:40 10.10:00 flag 17 range 0 5
 
diff --git a/Assets/StreamingAssets/Quests/Q0C4XY04.txt b/Assets/StreamingAssets/Quests/Q0C4XY04.txt
index c967b3b4a3..7482f4d5d0 100644
--- a/Assets/StreamingAssets/Quests/Q0C4XY04.txt
+++ b/Assets/StreamingAssets/Quests/Q0C4XY04.txt
@@ -122,7 +122,7 @@ Item _heart_ daedra_heart
 
 Person _questgiver_ group Questor anyInfo 1011
 
-Place _mondung_ remote dungeon8 anyInfo 1012
+Place _mondung_ remote dungeon8 only anyInfo 1012
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/R0C10Y06.txt b/Assets/StreamingAssets/Quests/R0C10Y06.txt
index 508697175b..562e47fa62 100644
--- a/Assets/StreamingAssets/Quests/R0C10Y06.txt
+++ b/Assets/StreamingAssets/Quests/R0C10Y06.txt
@@ -114,7 +114,7 @@ Item _reward_ gold
 
 Person _questgiver_ face 112 group Questor
 
-Place _itemdung_ remote dungeon1
+Place _itemdung_ remote dungeon1 only
 
 Clock _1stparton_ 00:00 0 flag 17 range 0 2
 
diff --git a/Assets/StreamingAssets/Quests/R0C10Y21.txt b/Assets/StreamingAssets/Quests/R0C10Y21.txt
index c4a15b343f..8379b0e877 100644
--- a/Assets/StreamingAssets/Quests/R0C10Y21.txt
+++ b/Assets/StreamingAssets/Quests/R0C10Y21.txt
@@ -120,7 +120,7 @@ Person _questgiver_ face 112 group Questor
 Person _qgfriend_ group Noble remote anyInfo 1011
 Person _dummyorc_ faction Orsinium remote
 
-Place _mondung_ remote dungeon4
+Place _mondung_ remote dungeon4,dungeon7 only
 
 Clock _1stparton_ 00:00 0 flag 1 range 2 5
 
diff --git a/Assets/StreamingAssets/Quests/R0C20Y07.txt b/Assets/StreamingAssets/Quests/R0C20Y07.txt
index 7d62c64f99..726866596e 100644
--- a/Assets/StreamingAssets/Quests/R0C20Y07.txt
+++ b/Assets/StreamingAssets/Quests/R0C20Y07.txt
@@ -116,7 +116,7 @@ Item _item_ sapphire
 Person _questgiver_ face 112 group Questor
 Person _qgfriend_ group Local_3.0 remote
 
-Place _itemdung_ remote dungeon13
+Place _itemdung_ remote dungeon13 only
 
 Clock _1stparton_ 00:00 0 flag 1 range 2 5
 --changed flags on timer, was giving very short time limits before
diff --git a/Assets/StreamingAssets/Quests/S0000018.txt b/Assets/StreamingAssets/Quests/S0000018.txt
index e1117c19e9..ef0afca485 100644
--- a/Assets/StreamingAssets/Quests/S0000018.txt
+++ b/Assets/StreamingAssets/Quests/S0000018.txt
@@ -109,7 +109,7 @@ Person _medora_ named Medora atHome
 Person _gortwog_ named Gortwog atHome
 
 Place _orsinium_ permanent OrsiniumCastle2
-Place _crypt_ remote dungeon0
+Place _crypt_ remote dungeon0 only
 
 Clock _delay_ 00:02 0 flag 1 range 0 1
 Clock _S.01_ 00:02 0 flag 1 range 0 1
diff --git a/Assets/StreamingAssets/Quests/T0C00Y00.txt b/Assets/StreamingAssets/Quests/T0C00Y00.txt
index 77650b92ef..3202529a3f 100644
--- a/Assets/StreamingAssets/Quests/T0C00Y00.txt
+++ b/Assets/StreamingAssets/Quests/T0C00Y00.txt
@@ -140,7 +140,7 @@ Item _artifact_ artifact Azuras_Star anyInfo 1014
 Person _questgiver_ face 112 named Azura anyInfo 1013
 Person _qgfriend_ group Librarian anyInfo 1011 rumors 1012
 
-Place _mondung_ remote dungeon4
+Place _mondung_ remote dungeon4,dungeon7 only
 
 Clock _1stparton_ 00:00 0 flag 1 range 2 5
 
diff --git a/Assets/StreamingAssets/Quests/U0C00Y00.txt b/Assets/StreamingAssets/Quests/U0C00Y00.txt
index 38eb187c6d..534d82f007 100644
--- a/Assets/StreamingAssets/Quests/U0C00Y00.txt
+++ b/Assets/StreamingAssets/Quests/U0C00Y00.txt
@@ -176,8 +176,8 @@ Person _questgiver_ face 112 named Boethiah anyInfo 1013
 Person _qgfriend_ group Librarian anyInfo 1011 rumors 1012
 Person _mfriend_ group Local_4.0 remote
 
-Place _mondung_ remote dungeon2
-Place _hideout_ remote dungeon6
+Place _mondung_ remote dungeon2,dungeon15 only
+Place _hideout_ remote dungeon6,dungeon5 only
 
 Clock _1stparton_ 00:00 0 flag 1 range 2 5
 Clock _escapetime_ 00:00 0 flag 1 range 2 3
diff --git a/Assets/StreamingAssets/Quests/__DEMO12.txt b/Assets/StreamingAssets/Quests/__DEMO12.txt
index 1537f82ccc..38a92b3780 100644
--- a/Assets/StreamingAssets/Quests/__DEMO12.txt
+++ b/Assets/StreamingAssets/Quests/__DEMO12.txt
@@ -141,7 +141,7 @@ Item _gold_ gold
 
 Person _qgiver_ group Questor male
 
-Place _mondung_ remote dungeon0
+Place _mondung_ remote dungeon0,dungeon8 only
 
 Clock _queston_ 00:00 0 flag 17 range 0 2