Fixed issue with multiple click event listeners when changing data sets