Fix to ensure the first component was removed and add a new component after saving the list

Reviewer: Cy Casada

Issue: GCP-10054