Fixed add/remove of (extra)ListItems