diff --git a/packages/apTag/tagItems/items/gel_fizz_50s/properties.txt b/packages/apTag/tagItems/items/gel_fizz_50s/properties.txt
index 32fe21029b..9d1a7d0fc5 100644
--- a/packages/apTag/tagItems/items/gel_fizz_50s/properties.txt
+++ b/packages/apTag/tagItems/items/gel_fizz_50s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
diff --git a/packages/apTag/tagItems/items/gel_fizz_70s/properties.txt b/packages/apTag/tagItems/items/gel_fizz_70s/properties.txt
index 32fe21029b..9d1a7d0fc5 100644
--- a/packages/apTag/tagItems/items/gel_fizz_70s/properties.txt
+++ b/packages/apTag/tagItems/items/gel_fizz_70s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
diff --git a/packages/apTag/tagItems/items/gel_fizz_80s/properties.txt b/packages/apTag/tagItems/items/gel_fizz_80s/properties.txt
index 32fe21029b..9d1a7d0fc5 100644
--- a/packages/apTag/tagItems/items/gel_fizz_80s/properties.txt
+++ b/packages/apTag/tagItems/items/gel_fizz_80s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
diff --git a/packages/apTag/tagItems/items/gel_fizz_clean/properties.txt b/packages/apTag/tagItems/items/gel_fizz_clean/properties.txt
index 32fe21029b..9d1a7d0fc5 100644
--- a/packages/apTag/tagItems/items/gel_fizz_clean/properties.txt
+++ b/packages/apTag/tagItems/items/gel_fizz_clean/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
diff --git a/packages/apTag/tagItems/items/gel_fizz_over/properties.txt b/packages/apTag/tagItems/items/gel_fizz_over/properties.txt
index 32fe21029b..9d1a7d0fc5 100644
--- a/packages/apTag/tagItems/items/gel_fizz_over/properties.txt
+++ b/packages/apTag/tagItems/items/gel_fizz_over/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
diff --git a/packages/apTag/tagItems/items/gel_fizz_p1/properties.txt b/packages/apTag/tagItems/items/gel_fizz_p1/properties.txt
index 32fe21029b..9d1a7d0fc5 100644
--- a/packages/apTag/tagItems/items/gel_fizz_p1/properties.txt
+++ b/packages/apTag/tagItems/items/gel_fizz_p1/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"Aperture Tag, Custom, Fizzler"
+	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
diff --git a/packages/deathfizzler/items/50s/properties.txt b/packages/deathfizzler/items/50s/properties.txt
index 3a7fa120df..b81f195394 100644
--- a/packages/deathfizzler/items/50s/properties.txt
+++ b/packages/deathfizzler/items/50s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"LpFreaky90, TeamSpen210"
-	"Tags"			"BEE2; Custom"
+	"Tags"			"BEE2; Custom;Fizzlers"
 	"infoURL"		"http:/\/forums.thinkingwithportals.com/downloads.php?view=detail&df_id=1727"
 	"Description"
 		{
diff --git a/packages/deathfizzler/items/clean/properties.txt b/packages/deathfizzler/items/clean/properties.txt
index 7297679e00..41d6421565 100644
--- a/packages/deathfizzler/items/clean/properties.txt
+++ b/packages/deathfizzler/items/clean/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"LpFreaky90, TeamSpen210"
-	"Tags"			"BEE2; Custom"
+	"Tags"			"BEE2; Custom;Fizzlers"
 	"infoURL"		"http:/\/forums.thinkingwithportals.com/downloads.php?view=detail&df_id=1727"
 	"Description"
 		{
diff --git a/packages/fr_fizzlers/items/csf_50s/editoritems.txt b/packages/fr_fizzlers/items/csf_50s/editoritems.txt
index 7ebac7940e..7ebf2330cb 100644
--- a/packages/fr_fizzlers/items/csf_50s/editoritems.txt
+++ b/packages/fr_fizzlers/items/csf_50s/editoritems.txt
@@ -10,7 +10,7 @@
 			"Name"			"Compressed Smoke Field"
 			"Model"
 			{
-				"ModelName"		"fizzler.3ds"
+				"ModelName"		"fizzler.mdl"
 			}
 			"Palette"
 			{
diff --git a/packages/fr_fizzlers/items/csf_50s/properties.txt b/packages/fr_fizzlers/items/csf_50s/properties.txt
index 92ccceadc1..98ad200fd7 100644
--- a/packages/fr_fizzlers/items/csf_50s/properties.txt
+++ b/packages/fr_fizzlers/items/csf_50s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"FourthReaper, TeamSpen210"
-	"Tags"			"FourthReaper, Custom, Fizzler"
+	"Tags"			"FourthReaper; Custom; Fizzlers"
 	"infoURL"		"http:/\/steamcommunity.com/sharedfiles/filedetails/?id=71863678"
 	"Description"
 		{
diff --git a/packages/fr_fizzlers/items/csf_clean/editoritems.txt b/packages/fr_fizzlers/items/csf_clean/editoritems.txt
index 1f9c60e784..404c387052 100644
--- a/packages/fr_fizzlers/items/csf_clean/editoritems.txt
+++ b/packages/fr_fizzlers/items/csf_clean/editoritems.txt
@@ -10,7 +10,7 @@
 			"Name"			"Compressed Smoke Field"
 			"Model"
 			{
-				"ModelName"		"fizzler.3ds"
+				"ModelName"		"fizzler.mdl"
 			}
 			"Palette"
 			{
diff --git a/packages/fr_fizzlers/items/csf_clean/properties.txt b/packages/fr_fizzlers/items/csf_clean/properties.txt
index 8f459924a1..5a2f9bc34a 100644
--- a/packages/fr_fizzlers/items/csf_clean/properties.txt
+++ b/packages/fr_fizzlers/items/csf_clean/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"FourthReaper, TeamSpen210"
-	"Tags"			"FourthReaper, Custom, Fizzler"
+	"Tags"			"FourthReaper; Custom; Fizzlers"
 	"infoURL"		"http:/\/steamcommunity.com/sharedfiles/filedetails/?id=71863678"
 	"Description"
 		{
diff --git a/packages/fr_fizzlers/items/fdf_50s/properties.txt b/packages/fr_fizzlers/items/fdf_50s/properties.txt
index b4f320eecb..df3b33209f 100644
--- a/packages/fr_fizzlers/items/fdf_50s/properties.txt
+++ b/packages/fr_fizzlers/items/fdf_50s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"FourthReaper, TeamSpen210"
-	"Tags"			"FourthReaper, Custom, Fizzler"
+	"Tags"			"FourthReaper; Custom; Fizzlers"
 	"infoURL"		"http:/\/steamcommunity.com/sharedfiles/filedetails/?id=71863678"
 	"Description"
 		{
diff --git a/packages/fr_fizzlers/items/fdf_clean/properties.txt b/packages/fr_fizzlers/items/fdf_clean/properties.txt
index eb29e798ab..0ea39e87ab 100644
--- a/packages/fr_fizzlers/items/fdf_clean/properties.txt
+++ b/packages/fr_fizzlers/items/fdf_clean/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"FourthReaper, TeamSpen210"
-	"Tags"			"FourthReaper, Custom, Fizzler"
+	"Tags"			"FourthReaper; Custom; Fizzlers"
 	"infoURL"		"http:/\/steamcommunity.com/sharedfiles/filedetails/?id=71863678"
 	"Description"
 		{
diff --git a/packages/fr_fizzlers/items/mif_50s/properties.txt b/packages/fr_fizzlers/items/mif_50s/properties.txt
index 9037125877..8d8b59df36 100644
--- a/packages/fr_fizzlers/items/mif_50s/properties.txt
+++ b/packages/fr_fizzlers/items/mif_50s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"FourthReaper, TeamSpen210"
-	"Tags"			"FourthReaper, Custom, Fizzler"
+	"Tags"			"FourthReaper; Custom; Fizzlers"
 	"infoURL"		"http:/\/steamcommunity.com/sharedfiles/filedetails/?id=71863678"
 	"Description"
 		{
diff --git a/packages/fr_fizzlers/items/mif_clean/properties.txt b/packages/fr_fizzlers/items/mif_clean/properties.txt
index 6b654022bf..b7f8cb0c8e 100644
--- a/packages/fr_fizzlers/items/mif_clean/properties.txt
+++ b/packages/fr_fizzlers/items/mif_clean/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"FourthReaper, TeamSpen210"
-	"Tags"			"FourthReaper, Custom, Fizzler"
+	"Tags"			"FourthReaper; Custom; Fizzlers"
 	"infoURL"		"http:/\/steamcommunity.com/sharedfiles/filedetails/?id=71863678"
 	"Description"
 		{
diff --git a/packages/paintFizzler/items/50s/properties.txt b/packages/paintFizzler/items/50s/properties.txt
index 180f33fb71..eda827d8b4 100644
--- a/packages/paintFizzler/items/50s/properties.txt
+++ b/packages/paintFizzler/items/50s/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Carl Kenner, TeamSpen210"
-	"Tags"			"BEE2; Custom"
+	"Tags"			"BEE2; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"		"This fizzler destroys all kinds of paint."
diff --git a/packages/paintFizzler/items/clean/properties.txt b/packages/paintFizzler/items/clean/properties.txt
index 8703f7b6f9..08a3a89364 100644
--- a/packages/paintFizzler/items/clean/properties.txt
+++ b/packages/paintFizzler/items/clean/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Carl Kenner; TeamSpen210"
-	"Tags"			"BEE2; Custom"
+	"Tags"			"BEE2; Custom; Gel; Fizzlers"
 	"Description"
 		{
 		"Line"		"Paint Fizzlers are a cut testing element. They destroy paint and clean cubes on contact. They do not affect anything else."
diff --git a/packages/styles/bts_style/items/gel/properties.txt b/packages/styles/bts_style/items/gel/properties.txt
index 4e0d54da5e..dfb5f33353 100644
--- a/packages/styles/bts_style/items/gel/properties.txt
+++ b/packages/styles/bts_style/items/gel/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Valve, Carl Kenner"
-	"Tags"			"Portal 2; Test Elements"
+	"Tags"			"Portal 2; Test Elements; Gel"
 	"Description"
 		{
 		"Line"	"Various paints that give surfaces different properties. The dropper can be deleted to make pre-placed gel splats."
diff --git a/packages/styles/oldAp/items/fizz/properties.txt b/packages/styles/oldAp/items/fizz/properties.txt
index 8e41042392..7238680c92 100644
--- a/packages/styles/oldAp/items/fizz/properties.txt
+++ b/packages/styles/oldAp/items/fizz/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Carl Kenner, TeamSpen210"
-	"Tags"			"Portal 2;Test Elements"
+	"Tags"			"Portal 2; Test Elements; Fizzlers"
 	"Description"	
 		{
 			"Line"	"Pairs of emitters that produce a hazardous field."
diff --git a/packages/styles/oldAp/items/fizz_improved/properties.txt b/packages/styles/oldAp/items/fizz_improved/properties.txt
index 8e41042392..7238680c92 100644
--- a/packages/styles/oldAp/items/fizz_improved/properties.txt
+++ b/packages/styles/oldAp/items/fizz_improved/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Carl Kenner, TeamSpen210"
-	"Tags"			"Portal 2;Test Elements"
+	"Tags"			"Portal 2; Test Elements; Fizzlers"
 	"Description"	
 		{
 			"Line"	"Pairs of emitters that produce a hazardous field."
diff --git a/packages/styles/oldAp/items/fizz_sparky/properties.txt b/packages/styles/oldAp/items/fizz_sparky/properties.txt
index 8e41042392..7238680c92 100644
--- a/packages/styles/oldAp/items/fizz_sparky/properties.txt
+++ b/packages/styles/oldAp/items/fizz_sparky/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Carl Kenner, TeamSpen210"
-	"Tags"			"Portal 2;Test Elements"
+	"Tags"			"Portal 2; Test Elements; Fizzlers"
 	"Description"	
 		{
 			"Line"	"Pairs of emitters that produce a hazardous field."
diff --git a/packages/styles/oldAp/items/gel/properties.txt b/packages/styles/oldAp/items/gel/properties.txt
index 4e0d54da5e..dfb5f33353 100644
--- a/packages/styles/oldAp/items/gel/properties.txt
+++ b/packages/styles/oldAp/items/gel/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Valve, Carl Kenner"
-	"Tags"			"Portal 2; Test Elements"
+	"Tags"			"Portal 2; Test Elements; Gel"
 	"Description"
 		{
 		"Line"	"Various paints that give surfaces different properties. The dropper can be deleted to make pre-placed gel splats."
diff --git a/packages/styles/overgrown/items/fizz/properties.txt b/packages/styles/overgrown/items/fizz/properties.txt
index c13a3258cb..28377bef4b 100644
--- a/packages/styles/overgrown/items/fizz/properties.txt
+++ b/packages/styles/overgrown/items/fizz/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Valve, TeamSpen210"
-	"Tags"			"Portal 2;Test Elements"
+	"Tags"			"Portal 2; Test Elements; Fizzlers"
 	"Description"	
 		{
 			"Line"	"Pairs of emitters that produce a hazardous field."
diff --git a/packages/styles/p1_style/items/fizz/properties.txt b/packages/styles/p1_style/items/fizz/properties.txt
index 6faed39c40..2560e6e64f 100644
--- a/packages/styles/p1_style/items/fizz/properties.txt
+++ b/packages/styles/p1_style/items/fizz/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Carl Kenner, TeamSpen210"
-	"Tags"			"Portal 2;Test Elements"
+	"Tags"			"Portal 2; Test Elements; Fizzlers"
 	"Description"	
 		{
 			"Line"	"Pairs of emitters that produce a hazardous field. They appear with P1 style emitters, and P1 style fizzler fields."
diff --git a/packages/styles/p1_style/items/gel/properties.txt b/packages/styles/p1_style/items/gel/properties.txt
index 729a481853..a323af7e95 100644
--- a/packages/styles/p1_style/items/gel/properties.txt
+++ b/packages/styles/p1_style/items/gel/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Valve, Carl Kenner"
-	"Tags"			"Portal 2; Test Elements"
+	"Tags"			"Portal 2; Test Elements; Gel"
 	"Description"
 		{
 		"Line"		"Various paints that give surfaces different properties. The dropper can be deleted to make pre-placed gel splats."
diff --git a/packages/valve/hazards/items/fizz/properties.txt b/packages/valve/hazards/items/fizz/properties.txt
index e32ae55281..d383b6e465 100644
--- a/packages/valve/hazards/items/fizz/properties.txt
+++ b/packages/valve/hazards/items/fizz/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Valve"
-	"Tags"			"Portal 2;Test Elements"
+	"Tags"			"Portal 2; Test Elements; Fizzlers"
 	"Description"	
 		{
 			"Line"	"Pairs of emitters that produce a hazardous field."
diff --git a/packages/valve/test_elements/items/gel/properties.txt b/packages/valve/test_elements/items/gel/properties.txt
index 45f93991f5..ec7f757f72 100644
--- a/packages/valve/test_elements/items/gel/properties.txt
+++ b/packages/valve/test_elements/items/gel/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Valve, Carl Kenner"
-	"Tags"			"Portal 2; Test Elements"
+	"Tags"			"Portal 2; Test Elements; Gel"
 	"Description"
 		{
 		"Line"	"Various paints that give surfaces different properties. The dropper can be deleted to make pre-placed gel splats."
diff --git a/packages/valve/test_elements/items/gel_reflect/properties.txt b/packages/valve/test_elements/items/gel_reflect/properties.txt
index f3cd2e5bd7..100d5b528c 100644
--- a/packages/valve/test_elements/items/gel_reflect/properties.txt
+++ b/packages/valve/test_elements/items/gel_reflect/properties.txt
@@ -1,7 +1,7 @@
 "Properties"
 	{
 	"Authors"		"Valve, Carl Kenner"
-	"Tags"			"Portal 2; Test Elements"
+	"Tags"			"Portal 2; Test Elements; Gel"
 	"Description"
 		{
 		"Line"		"Reflection Gel is a cut gel that was going to be released with the Peer Review update."