Updated cartridges for restructured system
Updated filter interactions