Fixed issues with click / change event handling.