Fix: this fixes all traits sometimes being removed when not all is selected

GCP-10167

Reviewer: Daniel Villafuerte