Fix problem with refillable items, simplified canteen/drink code