[CDE-328]: fixed bug where only the first expand parameter was updated on click event
[CDE-328]: removed ambiguous cycle from code
Merge pull request #238 from davidmsantos90/master

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