more changes to new item identifier, many fixes