Improve ItemScoop fluid handling