Fixing events to pass to SF properly
Fixing detect click.