Improve multiple item handling