Fixes to Mapping back list using parent list to add and remove