Restoring ability for onClick callback in object oriented explore
Merge branch 'simplify'