[CDE-328]: fixed bug where only the first expand parameter was updated on click event

@pamval please review
you are right. one cycle is enough, going to change that right now