diff --git a/dist/addons/sourcemod/plugins/empfun.smx b/dist/addons/sourcemod/plugins/empfun.smx
index 39e8407fca08fe6cf964ef85045748c7259cf7d8..2eda6757a082f964ec19a6651a3efcba96a5ce4e 100644
Binary files a/dist/addons/sourcemod/plugins/empfun.smx and b/dist/addons/sourcemod/plugins/empfun.smx differ
diff --git a/dist/addons/sourcemod/scripting/empfun.sp b/dist/addons/sourcemod/scripting/empfun.sp
index 4a3f45c7b62ed5b6e788878ab503b54055701fdf..dfabc0201b75a01063eccea01ac3a59ba0e4709d 100644
--- a/dist/addons/sourcemod/scripting/empfun.sp
+++ b/dist/addons/sourcemod/scripting/empfun.sp
@@ -10,7 +10,7 @@
 #include <SteamWorks>
 
 
-#define PluginVersion "1.06" 
+#define PluginVersion "1.07" 
 float pVersion; 
 
 // note linearmap field is unstable
@@ -5017,8 +5017,9 @@ bool GetEntityData(char[] classname,any[] classInfo)
 bool ShouldSave(int entity,char[] classname,any[] classInfo)
 {
 	int hammerID = GetEntProp(entity,Prop_Data,"m_iHammerID");
-			
-	if(hammerID == 0 && classInfo[data_customOnly])
+	
+	// if the entity is customonly, don't save any non-custom entities.
+	if(hammerID > 0 && hammerID < BASEHAMMERID && classInfo[data_customOnly])
 	{
 		return false;
 	}
diff --git a/dist/scenarios/entdata.txt b/dist/scenarios/entdata.txt
index 036068a2b529db6a4ec7eeac10308f9212273325..ae76c7b035d0d3bb9dfd43d7fdc1ba73b7a310fc 100644
--- a/dist/scenarios/entdata.txt
+++ b/dist/scenarios/entdata.txt
@@ -1034,7 +1034,6 @@
 	"light_dynamic"
 	{
 		"extend"	"map_entity"
-		"version"	"0.78"
 		"customOnly"	"1"
 		"fields"
 		{
@@ -1089,7 +1088,6 @@
 	{
 		"extend"	"map_entity"
 		"customOnly"	"1"
-		"version"	"0.78"
 		"fields"
 		{
 			"damageRadius"
@@ -1140,7 +1138,6 @@
 	"env_fire"
 	{
 		"extend"	"map_entity"
-		"customOnly"	"1"
 		"version"	"0.80"
 		"fields"
 		{
@@ -1207,17 +1204,18 @@
 	}
 	
 	
-	
 	"emp_comm_restrict"
 	{
 		"extend"	"brush"
-		"customOnly"	"1"
+		"version"	"1.04"
+		"moveable"	"0"
 	}
 	// add fields in future. 
 	"emp_eng_restrict"
 	{
 		"extend"	"brush"
-		"customOnly"	"1"
+		"version"	"1.04"
+		"moveable"	"0"
 		"fields"
 		{
 			"restrictNF"
diff --git a/dist/updater.txt b/dist/updater.txt
index 11764547daf0d5630f59064c75db1a514d4640da..c57c27cb532f50621d933ae244dbad30d01e10fd 100644
--- a/dist/updater.txt
+++ b/dist/updater.txt
@@ -4,7 +4,7 @@
 	{
 		"Version"
 		{
-			"Latest"	"1.06"
+			"Latest"	"1.08"
 		}
 	}