looking in retrospect, all things related to click event should be part of the other pull request (the one that fixes the click events). I will rebase and edit the commit history (keeping same logic).