diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua
index 4dabe09..c79699b 100644
--- a/PHI-CL/data/b/gm-vp.lua
+++ b/PHI-CL/data/b/gm-vp.lua
@@ -9,12 +9,11 @@ mc.space_age()
 -- GM-VP C 31 BASE ENTITY
 -- GM-VP C 6 ELEVATED_RAILS ENTITY
 -- GM-VP C 19 SPACE_AGE ENTITY
-if items['entity_surface_conditions'] then
-    for _, v in pairs(items['entity_surface_conditions']) do
-        if data.raw[v] then
-            for _, v2 in pairs(data.raw[v]) do
-                v2.surface_conditions = nil
-            end
+-- entity_surface_conditions
+for c, _ in pairs(defines.prototypes.entity) do
+    if data.raw[c] then
+        for _, v in pairs(data.raw[c]) do
+            v.surface_conditions = nil
         end
     end
 end
@@ -452,12 +451,16 @@ end
 
 -- GM-VP H 1 QUALITY ITEM
 -- GM-VP H 24 SPACE_AGE ITEM
-for _, v in pairs(data.raw.item) do
-    v.auto_recycle = false
+for c, _ in pairs(defines.prototypes.item) do
+    if data.raw[c] then
+        for _, v in pairs(data.raw[c]) do
+            v.auto_recycle = false
 
-    if items['item'][v.name] then
-        v.hidden = true
-        v.hidden_in_factoriopedia = true
+            if items['item'][v.name] then
+                v.hidden = true
+                v.hidden_in_factoriopedia = true
+            end
+        end
     end
 end
 
diff --git a/PHI-CL/data/f/ct.lua b/PHI-CL/data/f/ct.lua
index 3a937d4..d4d0866 100644
--- a/PHI-CL/data/f/ct.lua
+++ b/PHI-CL/data/f/ct.lua
@@ -102,36 +102,64 @@ end
 
 -- CT A 1 BASE MAP_GEN_PRESET
 if settings.startup['PHI-CT-TILE'].value then
-    local autoplace_settings = {
-        tile = {
-            treat_missing_as_default = false,
-            settings = {
-                [settings.startup['PHI-CT-TILE-CHOICE'].value] = {
-                    frequency = 1.0,
-                    size = 1.0,
-                    richness = 1.0
-                }
-            }
-        },
-        entity = {
-            treat_missing_as_default = false
-        },
-        decorative = {
-            treat_missing_as_default = false
+    local autoplace_setting_decorative = {}
+    local autoplace_setting_entity = {}
+    local autoplace_setting_tile = {}
+
+    for k, _ in pairs(data.raw.tile) do
+        autoplace_setting_tile[k] = {
+            frequency = 0,
+            size = 0,
+            richness = 0
         }
+    end
+
+    autoplace_setting_tile[settings.startup['PHI-CT-TILE-CHOICE'].value] = {
+        frequency = 1,
+        size = 1,
+        richness = 1
     }
 
-    data.raw.planet['nauvis'].map_gen_settings = {
-        autoplace_controls = {},
-        autoplace_settings = autoplace_settings
-    }
+    for c, _ in pairs(defines.prototypes.entity) do
+        if data.raw[c] then
+            for k, _ in pairs(data.raw[c]) do
+
+                autoplace_setting_entity[k] = {
+                    frequency = 0,
+                    size = 0,
+                    richness = 0
+                }
+            end
+        end
+    end
+
+    for k, _ in pairs(data.raw['optimized-decorative']) do
+        autoplace_setting_decorative[k] = {
+            frequency = 0,
+            size = 0,
+            richness = 0
+        }
+    end
 
     data.raw['map-gen-presets']['default']['empty-world'] = {
         order = 'zz',
         basic_settings = {
             default_enable_all_autoplace_controls = false,
             autoplace_controls = {},
-            autoplace_settings = autoplace_settings,
+            autoplace_settings = {
+                tile = {
+                    treat_missing_as_default = false,
+                    settings = autoplace_setting_tile
+                },
+                entity = {
+                    treat_missing_as_default = false,
+                    settings = autoplace_setting_entity
+                },
+                decorative = {
+                    treat_missing_as_default = false,
+                    settings = autoplace_setting_decorative
+                }
+            },
             no_enemies_mode = true
         },
         advanced_settings = {