Fixed add/remove item from list