diff --git a/core/features/registries/entries/BasicCellHandler.java b/core/features/registries/entries/BasicCellHandler.java
index 2ff656fbc..a8bb8df3a 100644
--- a/core/features/registries/entries/BasicCellHandler.java
+++ b/core/features/registries/entries/BasicCellHandler.java
@@ -65,7 +65,7 @@ public class BasicCellHandler implements ICellHandler
 		if ( handler instanceof CellInventoryHandler )
 		{
 			CellInventoryHandler ci = (CellInventoryHandler) handler;
-			return ci.getCellInv().getStatusForCell();
+			return ci.getStatusForCell();
 		}
 		return 0;
 	}
diff --git a/core/localization/GuiText.java b/core/localization/GuiText.java
index e41afcea3..51879ecad 100644
--- a/core/localization/GuiText.java
+++ b/core/localization/GuiText.java
@@ -48,7 +48,9 @@ public enum GuiText
 
 	InterfaceTerminalHint, Range, TransparentFacades, TransparentFacadesHint,
 
-	NoCraftingJobs, CPUs, FacadeCrafting, inWorldCraftingPresses, ChargedQuartzFind;
+	NoCraftingJobs, CPUs, FacadeCrafting, inWorldCraftingPresses, ChargedQuartzFind,
+	
+	Included, Excluded, Partitioned, Precise, Fuzzy;
 
 	String root;
 
diff --git a/items/storage/ItemBasicStorageCell.java b/items/storage/ItemBasicStorageCell.java
index 3ec5cfdac..75483212e 100644
--- a/items/storage/ItemBasicStorageCell.java
+++ b/items/storage/ItemBasicStorageCell.java
@@ -12,6 +12,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import appeng.api.AEApi;
 import appeng.api.config.FuzzyMode;
+import appeng.api.config.IncludeExclude;
 import appeng.api.implementations.items.IItemGroup;
 import appeng.api.implementations.items.IStorageCell;
 import appeng.api.storage.ICellInventory;
@@ -75,28 +76,38 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
 	{
 		IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( i, null, StorageChannel.ITEMS );
 
-		if ( cdi instanceof CellInventoryHandler )
+		if ( cdi instanceof ICellInventoryHandler )
 		{
+			ICellInventoryHandler CI = (ICellInventoryHandler) cdi;
+			
 			ICellInventory cd = ((ICellInventoryHandler) cdi).getCellInv();
-			if ( cd != null )
+			if (cd != null)
 			{
-				l.add( cd.getUsedBytes() + " " + GuiText.Of.getLocal() + " " + cd.getTotalBytes() + " " + GuiText.BytesUsed.getLocal() );
-				l.add( cd.getStoredItemTypes() + " " + GuiText.Of.getLocal() + " " + cd.getTotalItemTypes() + " " + GuiText.Types.getLocal() );
-				/*
-				 * if ( cd.isPreformatted() ) { String List = StatCollector.translateToLocal( cd.getListMode() ==
-				 * ListMode.WHITELIST ? "AppEng.Gui.Whitelisted" : "AppEng.Gui.Blacklisted" ); if (
-				 * cd.isFuzzyPreformatted() ) l.add( StatCollector.translateToLocal( "Appeng.GuiITooltip.Partitioned" )
-				 * + " - " + List + " " + StatCollector.translateToLocal( "Appeng.GuiITooltip.Fuzzy" ) ); else l.add(
-				 * StatCollector.translateToLocal( "Appeng.GuiITooltip.Partitioned" ) + " - " + List + " " +
-				 * StatCollector.translateToLocal( "Appeng.GuiITooltip.Precise" ) ); }
-				 */
+				l.add(cd.getUsedBytes() + " " + GuiText.Of.getLocal() + " "
+						+ cd.getTotalBytes() + " "
+						+ GuiText.BytesUsed.getLocal());
+				
+				l.add(cd.getStoredItemTypes() + " " + GuiText.Of.getLocal()
+						+ " " + cd.getTotalItemTypes() + " "
+						+ GuiText.Types.getLocal());
+				
+				if ( CI.isPreformatted() )
+				{
+					String List = (CI.getIncludeExcludeMode() == IncludeExclude.WHITELIST ? GuiText.Included
+									: GuiText.Excluded ).getLocal();
+					
+					if ( CI.isFuzzy() )
+						l.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Fuzzy.getLocal() );
+					else
+						l.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Precise.getLocal()  );
+					
+				}
 			}
 		}
 	}
 
 	@Override
-	public int getBytes(ItemStack cellItem)
-	{
+	public int getBytes(ItemStack cellItem) {
 		return totalBytes;
 	}
 
diff --git a/me/storage/CellInventoryHandler.java b/me/storage/CellInventoryHandler.java
index aa0604a0f..e5f35a098 100644
--- a/me/storage/CellInventoryHandler.java
+++ b/me/storage/CellInventoryHandler.java
@@ -93,4 +93,31 @@ public class CellInventoryHandler extends MEInventoryHandler<IAEItemStack> imple
 			}
 		}
 	}
+
+	public boolean isPreformatted() 
+	{
+		return ! myPartitionList.isEmpty();
+	}
+
+	public boolean isFuzzy()
+	{
+		return myPartitionList instanceof FuzzyPriorityList;
+	}
+
+	@Override
+	public IncludeExclude getIncludeExcludeMode()
+	{
+		return myWhitelist;
+	}
+
+	public int getStatusForCell()
+	{
+			int val = getCellInv().getStatusForCell();
+			
+			if ( val == 1 && isPreformatted() )
+				val = 2;
+			
+			return val;
+	}
+
 }