improve IFluidContainerItem logic, fix #2295