[DF-1520] fix selection of added nodes, fix switchIndex of added node