diff --git a/plugins/entity/entity.cpp b/plugins/entity/entity.cpp
index f4ae5705..42ce2908 100644
--- a/plugins/entity/entity.cpp
+++ b/plugins/entity/entity.cpp
@@ -345,7 +345,6 @@ bool filter( const Entity& entity ) const {
 }
 };
 
-//filter_entity_classname g_filter_entity_world( "worldspawn" );
 filter_entity_classname g_filter_entity_func_group( "func_group" );
 filter_entity_classgroup g_filter_entity_func_detail( "func_detail" );
 filter_entity_classname g_filter_entity_light( "light" );
@@ -382,7 +381,10 @@ filter_entity_world g_filter_entity_world;
 void Entity_InitFilters(){
 	add_entity_filter( g_filter_entity_world, EXCLUDE_WORLD );
 	add_entity_filter( g_filter_entity_func_group, EXCLUDE_FUNC_GROUPS );
-	add_entity_filter( g_filter_entity_func_detail, EXCLUDE_DETAILS );
+	if( g_gameType == eGameTypeQuake1 ){
+		add_entity_filter( g_filter_entity_func_detail, EXCLUDE_DETAILS );
+		add_entity_filter( g_filter_entity_func_detail, EXCLUDE_STRUCTURAL, true );
+	}
 	add_entity_filter( g_filter_entity_world, EXCLUDE_ENT, true );
 	add_entity_filter( g_filter_entity_trigger, EXCLUDE_TRIGGERS );
 	add_entity_filter( g_filter_entity_misc_model, EXCLUDE_MODELS );
@@ -409,9 +411,7 @@ void Entity_Construct( EGameType gameType ){
 		Static<KeyIsName>::instance().m_nameKey = "targetname";
 	}
 
-	if( g_gameType == eGameTypeQuake1 ){
-		g_stupidQuakeBug = true;
-	}
+	g_stupidQuakeBug = ( g_gameType == eGameTypeQuake1 );
 
 	GlobalPreferenceSystem().registerPreference( "SI_ShowNames", BoolImportStringCaller( g_showNames ), BoolExportStringCaller( g_showNames ) );
 	GlobalPreferenceSystem().registerPreference( "SI_ShowBboxes", BoolImportStringCaller( g_showBboxes ), BoolExportStringCaller( g_showBboxes ) );
diff --git a/plugins/entity/light.cpp b/plugins/entity/light.cpp
index 966b0d58..b54ff063 100644
--- a/plugins/entity/light.cpp
+++ b/plugins/entity/light.cpp
@@ -47,7 +47,6 @@
 #include "instancelib.h"
 #include "transformlib.h"
 #include "entitylib.h"
-#include "render.h"
 #include "eclasslib.h"
 #include "render.h"
 #include "stringio.h"
diff --git a/radiant/brushmanip.cpp b/radiant/brushmanip.cpp
index 29a99bed..f090ab79 100644
--- a/radiant/brushmanip.cpp
+++ b/radiant/brushmanip.cpp
@@ -1208,8 +1208,10 @@ void BrushFilters_construct(){
 	add_brush_filter( g_filter_brush_visportal, EXCLUDE_VISPORTALS );
 	add_brush_filter( g_filter_brush_areaportal, EXCLUDE_AREAPORTALS );
 	add_brush_filter( g_filter_brush_translucent, EXCLUDE_TRANSLUCENT );
-	add_brush_filter( g_filter_brush_detail, EXCLUDE_DETAILS );
-	add_brush_filter( g_filter_brush_detail, EXCLUDE_STRUCTURAL, true );
+	if( !string_equal( GlobalRadiant().getRequiredGameDescriptionKeyValue( "entities" ), "quake" ) ){ /* conditional for entity based struct/det filters; see entity plugin */
+		add_brush_filter( g_filter_brush_detail, EXCLUDE_DETAILS );
+		add_brush_filter( g_filter_brush_detail, EXCLUDE_STRUCTURAL, true );
+	}
 	add_brush_filter( g_filter_brush_lightgrid, EXCLUDE_LIGHTGRID );
 	add_brush_filter( g_filter_brush_decals, EXCLUDE_DECALS );
 }