Fix issues with not tracking when items convert to/from bulkitems