diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index e975a5f..d4c7313 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -519,7 +519,7 @@ end
 ]]
 
 if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-FLUID'].value then
-    data:extend({{type='recipe-category', name='fluid'}})
+    data:extend({{type='recipe-category', name='fluid-s'}})
 
     local item = table.deepcopy(data.raw['item']['offshore-pump'])
     item.name = 'super-pump'
@@ -546,22 +546,23 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-FLUID'].value t
     entity.name = 'super-pump'
     entity.minable.result = 'super-pump'
     entity.type = 'assembling-machine'
-    entity.crafting_categories = {'fluid'}
+    entity.crafting_categories = {'fluid-s'}
     entity.crafting_speed = 1
     entity.energy_source = {type = 'void'}
-    entity.effect_receiver = {
-        uses_module_effects = false,
-        uses_beacon_effects = false,
-        uses_surface_effects = true
-    }
-    entity.allowed_effects = {
-        'consumption'
-    }
-    entity.module_slots = 0
-    entity.fluid_boxes_off_when_no_fluid_recipe = false
+    entity.effect_receiver = {uses_module_effects=false, uses_beacon_effects=false}
+    entity.allowed_effects = {'consumption'}
     entity.collision_mask = nil
     entity.tile_buildability_rules = nil
-    entity.layers = nil
+    entity.fluid_box.filter = nil
+    entity.fluid_box.production_type = 'output'
+    entity.fluid_box.pipe_connections = {{position = {0, 0}, direction = defines.direction.south, flow_direction = 'output'}}
+    entity.layers = {
+        item = true,
+        object = true,
+        player = true,
+        water_tile = true,
+        elevated_rail = true
+    }
     entity.fluid_source_offset = nil
     entity.localised_name = {'name.super-pump'}
     entity.localised_description = entity.localised_description
@@ -593,16 +594,14 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-FLUID'].value t
             data:extend({{
                 type = 'recipe',
                 name = v.name,
-                category = 'fluid',
+                category = 'fluid-s',
                 energy_required = 1,
                 enabled = true,
                 ingredients = {},
                 results = {{type='fluid', name=v.name, amount=2000, temperature=temp}},
                 main_product = v.name,
-                hide_from_stats = true,
                 hide_from_player_crafting = true,
-                allow_decomposition = false,
-                allow_as_intermediate = false,
+                allow_productivity = false,
                 localised_name = v.localised_name,
                 localised_description = nil
             }})
diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua
index a56f30c..90dd1d7 100644
--- a/PHI-CL/main.lua
+++ b/PHI-CL/main.lua
@@ -416,40 +416,34 @@ end
 
 -- entity category
 function main.EEEC(source, tier)
-    local category_name = source.type
-
-    if source.name == 'electric-filter-furnace' then
-        category_name = 'assembling-machine'
-    end
-
     local item_name = source.name .. '-' .. tier
 
-    if not data.raw[category_name][source.ref_name] then
+    if not data.raw[source.type][source.ref_name] then
         return
     end
 
-    if data.raw[category_name][source.ref_name].crafting_categories then
-        data.raw[category_name][item_name].crafting_categories = {}
+    if data.raw[source.type][source.ref_name].crafting_categories then
+        data.raw[source.type][item_name].crafting_categories = {}
 
-        for i=1, #data.raw[category_name][source.ref_name].crafting_categories do
-            table.insert(data.raw[category_name][item_name].crafting_categories, data.raw[category_name][source.ref_name].crafting_categories[i])
+        for i=1, #data.raw[source.type][source.ref_name].crafting_categories do
+            table.insert(data.raw[source.type][item_name].crafting_categories, data.raw[source.type][source.ref_name].crafting_categories[i])
         end
     end
 
-    if data.raw[category_name][source.ref_name].resource_categories then
-        data.raw[category_name][item_name].resource_categories = {}
+    if data.raw[source.type][source.ref_name].resource_categories then
+        data.raw[source.type][item_name].resource_categories = {}
 
-        for i=1, #data.raw[category_name][source.ref_name].resource_categories do
-            table.insert(data.raw[category_name][item_name].resource_categories, data.raw[category_name][source.ref_name].resource_categories[i])
+        for i=1, #data.raw[source.type][source.ref_name].resource_categories do
+            table.insert(data.raw[source.type][item_name].resource_categories, data.raw[source.type][source.ref_name].resource_categories[i])
         end
     end
 
-    if data.raw[category_name][source.ref_name].fuel_categories then
-        data.raw[category_name][item_name].fuel_categories = table.deepcopy(data.raw[category_name][source.ref_name].fuel_categories)
+    if data.raw[source.type][source.ref_name].fuel_categories then
+        data.raw[source.type][item_name].fuel_categories = table.deepcopy(data.raw[source.type][source.ref_name].fuel_categories)
     end
 
-    if data.raw[category_name][source.ref_name].allowed_effects then
-        data.raw[category_name][item_name].allowed_effects = table.deepcopy(data.raw[category_name][source.ref_name].allowed_effects)
+    if data.raw[source.type][source.ref_name].allowed_effects then
+        data.raw[source.type][item_name].allowed_effects = table.deepcopy(data.raw[source.type][source.ref_name].allowed_effects)
     end
 end