- rework on addItem and removeItem. Refs #102